diff --git a/build/changelog-generator/index.js b/build/changelog-generator/index.js
index 6ef54fd0f49b..a8cc319d960d 100644
--- a/build/changelog-generator/index.js
+++ b/build/changelog-generator/index.js
@@ -20,6 +20,12 @@ const parserOpts = {
   ],
 };
 
+process.stderr.write(`
+> Be sure to have the latest git tags locally:
+    git fetch --tags
+
+`);
+
 const writerOpts = {
   mainTemplate,
   headerPartial,
diff --git a/package.json b/package.json
index 156e6f1735cf..60ef4d454913 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "deploy-viewer": "cd lighthouse-viewer && gulp deploy",
     "bundlesize": "bundlesize",
     "plots-smoke": "bash plots/test/smoke.sh",
-    "changelog": "conventional-changelog -n ./build/changelog-generator/index.js -i changelog.md -s"
+    "changelog": "conventional-changelog --config ./build/changelog-generator/index.js --infile changelog.md --same-file"
   },
   "devDependencies": {
     "@types/node": "^6.0.45",