diff --git a/build/tasks/prepare-release.js b/build/tasks/prepare-release.js
index 3425ef7..b374e6b 100644
--- a/build/tasks/prepare-release.js
+++ b/build/tasks/prepare-release.js
@@ -1,10 +1,19 @@
 var gulp = require('gulp');
 var runSequence = require('run-sequence');
 var paths = require('../paths');
-var changelog = require('conventional-changelog');
 var fs = require('fs');
 var bump = require('gulp-bump');
 var args = require('../args');
+var conventionalChangelog = require('gulp-conventional-changelog');
+
+gulp.task('changelog', function () {
+  return gulp.src(paths.doc + '/CHANGELOG.md', {
+    buffer: false
+  }).pipe(conventionalChangelog({
+    preset: 'angular'
+  }))
+  .pipe(gulp.dest(paths.doc));
+});
 
 gulp.task('bump-version', function(){
   return gulp.src(['./package.json', './bower.json'])
@@ -12,18 +21,6 @@ gulp.task('bump-version', function(){
     .pipe(gulp.dest('./'));
 });
 
-gulp.task('changelog', function(callback) {
-  var pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
-
-  return changelog({
-    repository: pkg.repository.url,
-    version: pkg.version,
-    file: paths.doc + '/CHANGELOG.md'
-  }, function(err, log) {
-    fs.writeFileSync(paths.doc + '/CHANGELOG.md', log);
-  });
-});
-
 gulp.task('prepare-release', function(callback){
   return runSequence(
     'build',
diff --git a/package.json b/package.json
index fdbe71e..bdb73c6 100644
--- a/package.json
+++ b/package.json
@@ -61,12 +61,12 @@
     "babel-preset-es2015-loose": "^7.0.0",
     "babel-preset-es2015-loose-native-modules": "^1.0.0",
     "babel-preset-stage-1": "^6.5.0",
-    "conventional-changelog": "1.1.0",
     "del": "^2.2.0",
     "gulp": "^3.9.1",
     "gulp-babel": "^6.1.2",
     "gulp-bump": "^2.1.0",
     "gulp-concat": "^2.6.0",
+    "gulp-conventional-changelog": "^1.1.0",
     "gulp-eslint": "^2.0.0",
     "gulp-ignore": "^2.0.1",
     "gulp-insert": "^0.5.0",