diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4aef718b2d8..d98c6858768 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ https://github.com/elastic/beats/compare/v5.1.1...master[Check the HEAD diff]
 *Filebeat*
 - Fix registry cleanup issue when files falling under ignore_older after restart. {issue}2818[2818]
 - Fix registry migration issue from old states were files were only harvested after second restart. {pull}3322[3322]
+- Fix alignment issue were Filebeat compiled with Go 1.7.4 was crashing on 32 bits system. {issue}3273[3273]
 
 *Winlogbeat*
 - Fix for "The array bounds are invalid" error when reading large events. {issue}3076[3076]
diff --git a/filebeat/prospector/prospector.go b/filebeat/prospector/prospector.go
index 93277430b04..57bf0101678 100644
--- a/filebeat/prospector/prospector.go
+++ b/filebeat/prospector/prospector.go
@@ -21,6 +21,8 @@ var (
 )
 
 type Prospector struct {
+	// harvesterCount MUST be first field in struct. See https://github.com/golang/go/issues/599
+	harvesterCounter uint64         // Must be 8-byte aligned. Ensured if first field in struct
 	cfg              *common.Config // Raw config
 	config           prospectorConfig
 	prospectorer     Prospectorer
@@ -30,7 +32,6 @@ type Prospector struct {
 	states           *file.States
 	wg               sync.WaitGroup
 	channelWg        sync.WaitGroup // Separate waitgroup for channels as not stopped on completion
-	harvesterCounter uint64
 }
 
 type Prospectorer interface {