diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/Gruntfile.js b/Gruntfile.js
index 641b382ed..f67bec251 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -137,16 +137,22 @@ module.exports = function(grunt) {
         updateConfigs: ['pkg'],
         commit: true,
         commitMessage: 'Release v%VERSION%',
-        commitFiles: ['package.json', 'dist/'], // '-a' for all files
+        commitFiles: ['package.json', 'CHANGELOG.md', 'dist/'], // '-a' for all files
         createTag: true,
         tagName: 'v%VERSION%',
         tagMessage: 'Version %VERSION%',
-        push: true,
+        push: false,
         pushTo: 'origin',
         gitDescribeOptions: '--tags --always --abbrev=1 --dirty=-d' // options to use with '$ git describe'
       }
     },
 
+    changelog: {
+        options: {
+            dest: 'CHANGELOG.md'
+        }
+    },
+
     watch: {
       files: ['libs/*.js', 'src/*.js', 'Gruntfile.js'],
       tasks: ['concat', 'uglify', 'cssmin']
@@ -161,15 +167,17 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-contrib-yuidoc');
   grunt.loadNpmTasks('grunt-bump');
+  grunt.loadNpmTasks('grunt-conventional-changelog');
 
   // Default task.
   grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'cssmin']);
   grunt.registerTask('build', ['default']);
   grunt.registerTask('docs', ['yuidoc']);
 
-  grunt.registerTask('release', ['build', 'bump-only:patch', 'build', 'docs', 'bump-commit']);
-  grunt.registerTask('release:minor', ['build', 'bump-only:minor', 'build', 'docs', 'bump-commit']);
-  grunt.registerTask('release:major', ['build', 'bump-only:major', 'build', 'docs', 'bump-commit']);
-  grunt.registerTask('release:git', ['build', 'bump-only:git', 'build', 'docs', 'bump-commit']);
+  grunt.registerTask('release', ['build', 'bump-only:patch', 'build', 'docs', 'changelog']);
+  grunt.registerTask('release:minor', ['build', 'bump-only:minor', 'build', 'docs', 'changelog']);
+  grunt.registerTask('release:major', ['build', 'bump-only:major', 'build', 'docs', 'changelog']);
+  grunt.registerTask('release:git', ['build', 'bump-only:git', 'build', 'docs', 'changelog', 'bump-commit']);
+  grunt.registerTask('release:commit', ['bump-commit']);
 
 };
diff --git a/package.json b/package.json
index a266ea66b..fd0e4ecef 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "grunt-contrib-yuidoc": "~0.4.0",
     "bower": "~0.9.2",
     "qunit": "~1.11.0",
-    "grunt-bump": "0.0.11"
+    "grunt-bump": "0.0.11",
+    "grunt-conventional-changelog": "~1.0.0"
   }
 }