diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 0d6ed4bade49..ea4b8cdc1c23 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -241,6 +241,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Allow cgroup self-monitoring to see alternate `hostfs` paths {pull}24334[24334]
 - Fix 'make setup' instructions for a new beat {pull}24944[24944]
 - Fix inode removal tracking code when files are replaced by files with the same name {pull}25002[25002]
+- Fix `mage GenerateCustomBeat` instructions for a new beat {pull}17679[17679]
 
 *Auditbeat*
 
diff --git a/docs/devguide/newbeat.asciidoc b/docs/devguide/newbeat.asciidoc
index 56677b5d6195..956183d453b2 100644
--- a/docs/devguide/newbeat.asciidoc
+++ b/docs/devguide/newbeat.asciidoc
@@ -120,7 +120,6 @@ Now create a directory under $GOPATH for your repository and change to the new d
 [source,shell]
 --------------------
 mkdir ${GOPATH}/src/github.com/{user}
-cd ${GOPATH}/src/github.com/{user}
 --------------------
 
 Run the mage script to generate the custom beat:
@@ -128,6 +127,7 @@ Run the mage script to generate the custom beat:
 
 [source,shell]
 --------------------
+cd ${GOPATH}/src/github.com/elastic/beats
 mage GenerateCustomBeat
 --------------------