diff --git a/package.json b/package.json
index e205ef5ea8..27bf3d3aad 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,8 @@
     "karma-sauce-launcher": "~0.2.0",
     "karma-script-launcher": "~0.1.0",
     "load-grunt-tasks": "~0.3.0",
-    "grunt-remove-logging": "~0.2.0"
+    "grunt-remove-logging": "~0.2.0",
+    "grunt-conventional-changelog": "~1.1.0"
   },
   "licenses": [
     {
diff --git a/scripts/release/finalize-version.sh b/scripts/release/finalize-version.sh
index 08270dcae4..ea9af7b2f9 100755
--- a/scripts/release/finalize-version.sh
+++ b/scripts/release/finalize-version.sh
@@ -27,13 +27,16 @@ function prepare {
   mkdir -p release
   cp -Rf dist/* release
 
-  git add package.json bower.json component.json release
+  grunt changelog
+
+  git add package.json bower.json component.json release CHANGELOG.md
   git commit -m "chore(release): v$VERSION"
   git tag -m "v$VERSION" v$VERSION
 
   echo "--"
   echo "-- Version is now $VERSION, codename $CODENAME."
-  echo "-- Release commit & tag created."
+  echo "-- Release commit & tag created. Changelog created."
+  echo "-- Suggestion: read over the changelog and fix any mistakes, then run git commit -a --amend."
   echo "-- When ready to push, run ./scripts/finalize-version.sh --action=publish"
   echo "--"
 }