diff --git a/gulpfile.js b/gulpfile.js
index 11cde45389..fd33d204ad 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -13,6 +13,7 @@ var dgeni = require('dgeni');
 var es = require('event-stream');
 var htmlparser = require('htmlparser2');
 var lunr = require('lunr');
+var markdown = require('markdown').markdown;
 var mkdirp = require('mkdirp');
 var yaml = require('js-yaml');
 
@@ -34,6 +35,8 @@ var twitter = require('gulp-twitter');
 var uglify = require('gulp-uglify');
 var gutil = require('gulp-util');
 
+gutil.log = function(){};
+
 var banner = _.template(buildConfig.banner, { pkg: pkg });
 
 var IS_RELEASE_BUILD = !!argv.release;
@@ -67,14 +70,22 @@ gulp.task('watch', ['build'], function() {
 });
 
 gulp.task('changelog', function(done) {
+  var file = argv.prepend ? 'CHANGELOG.md' : '';
+  var subtitle = argv.subtitle || '"' + pkg.codename + '"';
+  var toHtml = !!argv.html;
+  var dest = argv.dest || 'CHANGELOG.md';
+  console.log(JSON.stringify(argv, null, 2));
   changelog({
     repository: 'https://github.com/driftyco/ionic',
-    codename: pkg.codename,
-    version: pkg.version
+    version: pkg.version,
+    subtitle: subtitle,
+    file: file
   }, function(err, data) {
     if (err) return done(err);
-    fs.writeFileSync('CHANGELOG.md', data);
-    fs.writeFileSync(buildConfig.dist + '/CHANGELOG.md', data);
+    if (toHtml) {
+      data = markdown.toHTML(data);
+    }
+    fs.writeFileSync(dest, data);
     done();
   });
 });
diff --git a/package.json b/package.json
index b0a7d2effd..7bcb139746 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "semver": "^2.2.1",
     "cp-r": "^0.1.1",
     "mkdirp": "^0.3.5",
-    "conventional-changelog": "0.0.6",
+    "conventional-changelog": "0.0.8",
     "lunr": "0.4.5",
     "htmlparser2": "3.7.0",
     "js-yaml": "3.0.2",
@@ -51,5 +51,8 @@
     {
       "type": "MIT"
     }
-  ]
+  ],
+  "dependencies": {
+    "markdown": "^0.5.0"
+  }
 }
diff --git a/scripts/travis/ci.sh b/scripts/travis/ci.sh
index 341858b97b..a5c2691c73 100755
--- a/scripts/travis/ci.sh
+++ b/scripts/travis/ci.sh
@@ -94,7 +94,10 @@ function run {
 
     VERSION_NAME="nightly"
 
-    gulp changelog
+    gulp changelog --prepend=false \
+      --html=true \
+      --subtitle="(changes since $OLD_VERSION)" \
+      --dest="dist/CHANGELOG.html"
   fi
 
   ./scripts/site/publish.sh \