diff --git a/.gitignore b/.gitignore
index 5d9d23983..b41893b48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,8 +14,6 @@ doc/
 .coveralls.yml
 coverage/
 /screenshots
-changelog.js
-write-changelog.js
 test/fixtures/multi/
 before.json
 after.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5f9d4a16..a877af5e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,43 @@
+<a name="2.8.1"></a>
+## 2.8.1 (2015-07-28)
+
+
+### Bug Fixes
+
+* **web-sockets:** Use separate server for web sockets in proxy mode - fixes #625 ([40017b4](https://github.com/browsersync/browser-sync/commit/40017b4)), closes [#625](https://github.com/browsersync/browser-sync/issues/625)
+
+### Features
+
+* **serve-static:** Added option `serveStatic` to allow proxy/snippet mode to easily serve local fil ([384ef67](https://github.com/browsersync/browser-sync/commit/384ef67))
+
+
+
+<a name="2.7.13"></a>
+## 2.7.13 (2015-06-28)
+
+
+### Bug Fixes
+
+* **snippet:** Allow async attribute to be removed from snippet with snippetOptions.async = fal ([c32bec6](https://github.com/browsersync/browser-sync/commit/c32bec6)), closes [#670](https://github.com/browsersync/browser-sync/issues/670)
+* **socket-options:** allow socket.domain string|fn for setting domain only on socket path - fixes #69 ([5157432](https://github.com/browsersync/browser-sync/commit/5157432)), closes [#690](https://github.com/browsersync/browser-sync/issues/690)
+
+### Features
+
+* **api:** expose sockets to public api ([985682c](https://github.com/browsersync/browser-sync/commit/985682c))
+
+
+
+<a name="2.7.12"></a>
+## 2.7.12 (2015-06-17)
+
+
+### Bug Fixes
+
+* **client-script:** allow proxy to also use client script middleware ([c5fdbbf](https://github.com/browsersync/browser-sync/commit/c5fdbbf))
+* **client-script:** serve cached/gzipped client JS file - fixes #657 ([dbe9ffe](https://github.com/browsersync/browser-sync/commit/dbe9ffe)), closes [#657](https://github.com/browsersync/browser-sync/issues/657)
+
+
+
 <a name"2.7.11"></a>
 ### 2.7.11 (2015-06-16)
 
diff --git a/gulpfile.js b/gulpfile.js
index 7f75888ad..6b75cfb83 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,6 +7,7 @@ var contribs = require("gulp-contribs");
 var rubySass = require("gulp-ruby-sass");
 var filter = require("gulp-filter");
 var browserSync = require("./");
+var conventionalChangelog = require("gulp-conventional-changelog");
 
 gulp.task("lint", function () {
     gulp.src([
@@ -92,3 +93,13 @@ gulp.task("docs", function () {
         .pipe(yuidoc.parser({spaces: 4}))
         .pipe(gulp.dest("./doc"));
 });
+
+gulp.task("changelog", function () {
+    return gulp.src("CHANGELOG.md", {
+        buffer: false
+    })
+        .pipe(conventionalChangelog({
+            preset: "angular"
+        }))
+        .pipe(gulp.dest("./"));
+});
diff --git a/package.json b/package.json
index d53b4e217..7bae33aca 100644
--- a/package.json
+++ b/package.json
@@ -62,10 +62,10 @@
     "bs-snippet-injector": "^2.0.1",
     "chai": "^3.2.0",
     "chalk": "^1.1.0",
-    "conventional-changelog": "^0.0.17",
     "graceful-fs": "^3.0.8",
     "gulp": "^3.9.0",
     "gulp-contribs": "0.0.3",
+    "gulp-conventional-changelog": "^0.4.0",
     "gulp-filter": "^2.0.2",
     "gulp-jscs": "^1.6.0",
     "gulp-jshint": "^1.11.2",