diff --git a/CHANGELOG-developer.asciidoc b/CHANGELOG-developer.asciidoc
index cf844df59cfa..1bd76b966829 100644
--- a/CHANGELOG-developer.asciidoc
+++ b/CHANGELOG-developer.asciidoc
@@ -33,6 +33,7 @@ The list below covers the major changes between 6.3.0 and master only.
 ==== Bugfixes
 
 - Fix permissions of generated Filebeat filesets. {pull}7140[7140]
+- Collect fields from _meta/fields.yml too. {pull}8397[8397]
 
 ==== Added
 
diff --git a/libbeat/generator/fields/fields.go b/libbeat/generator/fields/fields.go
index 724338ab42bc..a7a6bd0fd6f2 100644
--- a/libbeat/generator/fields/fields.go
+++ b/libbeat/generator/fields/fields.go
@@ -33,6 +33,8 @@ type YmlFile struct {
 
 func collectCommonFiles(esBeatsPath, beatPath string, fieldFiles []*YmlFile) ([]*YmlFile, error) {
 	commonFields := []string{
+		// Fields for custom beats
+		filepath.Join(beatPath, "_meta/fields.yml"),
 		filepath.Join(beatPath, "_meta/fields.common.yml"),
 	}