diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..7fd8bafdd
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,212 @@
+## Change Log
+
+### v0.28.2 2016/03/10
+- [#201](https://github.com/opentable/oc/pull/201) Added license on minified oc-client.min.js (@matteofigus)
+
+### v0.28.1 2016/03/10
+- [#200](https://github.com/opentable/oc/pull/200) Have optional callbacks in CLI functions (@matteofigus)
+
+### v0.28.0 2016/03/08
+- [#198](https://github.com/opentable/oc/pull/198) More details on errors from node client (@matteofigus)
+- [#197](https://github.com/opentable/oc/pull/197) Return null when there's no error in renderComponents (@pbazydlo)
+
+### v0.27.9 2016/03/02
+- [#195](https://github.com/opentable/oc/pull/195) Warmup on client.init (@matteofigus)
+
+### v0.27.8 2016/03/02
+- [#196](https://github.com/opentable/oc/pull/196) Adding user-agent to node oc-client (@matteofigus)
+
+### v0.27.7 2016/03/01
+- [#194](https://github.com/opentable/oc/pull/194) Cleanup on client (@matteofigus)
+
+### v0.27.6 2016/02/29
+- [#193](https://github.com/opentable/oc/pull/193) Dev has optional callback in order to be used by grunt-oc (@matteofigus)
+- [#192](https://github.com/opentable/oc/pull/192) Less docs, more links (@matteofigus)
+
+### v0.27.5 2016/02/24
+- [#190](https://github.com/opentable/oc/pull/190) Publish error (@matteofigus)
+
+### v0.27.4 2016/02/24
+- [#189](https://github.com/opentable/oc/pull/189) Safe colors in order to avoid extending object and better testing (@matteofigus)
+
+### v0.27.1 2016/02/13
+- [#187](https://github.com/opentable/oc/pull/187) Moved the request util to its own module (@matteofigus)
+
+### v0.27.0 2016/02/12
+- [#186](https://github.com/opentable/oc/pull/186) Preserve language when doing client-side failover (@matteofigus)
+
+### v0.26.2 2016/02/11
+- [#182](https://github.com/opentable/oc/pull/182) Node.js client post and various improvements (@matteofigus)
+
+### v0.26.1 2016/02/11
+- [#184](https://github.com/opentable/oc/pull/184) Allow oc dev to be hosted from a custom base url (@antwhite)
+
+### v0.26.0 2016/01/31
+- [#178](https://github.com/opentable/oc/pull/178) node.js client should accept serverRendering and clientRendering endpoints instead of generic array (breaking change) (@matteofigus)
+
+### v0.25.0 2016/01/28
+- [#179](https://github.com/opentable/oc/pull/179) Oc client cleanup and improvements (@matteofigus)
+
+### v0.24.1 2016/01/28
+- [#180](https://github.com/opentable/oc/pull/180) update the dependencies (@matteofigus)
+
+### v0.24.0 2016/01/27
+- [#177](https://github.com/opentable/oc/pull/177) Npm ignore to avoid publishing unuseful stuff (@matteofigus)
+
+### v0.23.7 2016/01/21
+- [#173](https://github.com/opentable/oc/pull/173) Ownership of $$$ (@matteofigus)
+
+### v0.23.6 2016/01/20
+- [#172](https://github.com/opentable/oc/pull/172) Avoid client to be multiple times inside the page (@matteofigus)
+
+### v0.23.5 2016/01/19
+- [#171](https://github.com/opentable/oc/pull/171) Without cleaning up the namespace (@matteofigus)
+
+### v0.23.4 2016/01/19
+- [#170](https://github.com/opentable/oc/pull/170) jQuery in no conflict mode (@matteofigus)
+
+### v0.23.3 2016/01/18
+- [#169](https://github.com/opentable/oc/pull/169) pre-rendered modality is deprecated (@matteofigus)
+
+### v0.23.2 2016/01/15
+- [#168](https://github.com/opentable/oc/pull/168) Update dependencies (@matteofigus)
+- [#167](https://github.com/opentable/oc/pull/167) Sauce browsers updated + dev dependency updated (@matteofigus)
+
+### v0.23.1 2016/01/14
+- [#166](https://github.com/opentable/oc/pull/166) Bugfix and docs (@matteofigus)
+
+### v0.23.0 2016/01/14
+- [#165](https://github.com/opentable/oc/pull/165) Making the POST response API return status and response for each comp… (@matteofigus)
+
+### v0.22.3 2016/01/14
+- [#164](https://github.com/opentable/oc/pull/164) New component-retrieved event (@matteofigus)
+
+### v0.22.2 2016/01/11
+- [#163](https://github.com/opentable/oc/pull/163) POST route for allowing batch request (@matteofigus)
+- [#160](https://github.com/opentable/oc/pull/160) travis run tests with node 5 as well (@andyroyle)
+
+### v0.22.1 2015/12/22
+- [#159](https://github.com/opentable/oc/pull/159) should have an explicit dep on phantom (@andyroyle)
+
+### v0.22.0 2015/12/22
+- [#157](https://github.com/opentable/oc/pull/157) Server/Client-side render info (@matteofigus)
+- [#156](https://github.com/opentable/oc/pull/156) House keeping (@matteofigus)
+
+### v0.21.0 2015/11/26
+- [#155](https://github.com/opentable/oc/pull/155) Removing info, ls, link, unlink (@matteofigus)
+
+### v0.20.5 2015/11/24
+- [#153](https://github.com/opentable/oc/pull/153) js.gz + css.gz handling (@matteofigus)
+
+### v0.20.4 2015/11/24
+- [#148](https://github.com/opentable/oc/pull/148) only remove the package once published to all registries (@andyroyle)
+
+### v0.20.3 2015/11/23
+- [#152](https://github.com/opentable/oc/pull/152) woopsy, I broke `oc dev` (@andyroyle)
+
+### v0.20.2 2015/11/23
+- [#151](https://github.com/opentable/oc/pull/151) Run karma tests by default (@pbazydlo)
+
+### v0.20.1 2015/11/23
+- [#144](https://github.com/opentable/oc/pull/144) Oc client limited retries (@pbazydlo, @andyroyle)
+
+### v0.20.0 2015/11/20
+- [#141](https://github.com/opentable/oc/pull/141) allow plugins to depend on one another (breaking change) (@andyroyle)
+
+### v0.19.5 2015/11/20
+- [#147](https://github.com/opentable/oc/pull/147) Refactor cli/domain/local (@andyroyle)
+
+### v0.19.4 2015/11/17
+- [#145](https://github.com/opentable/oc/pull/145) oc dev fix (ie 8+) (@matteofigus)
+
+### v0.19.3 2015/11/11
+- [#143](https://github.com/opentable/oc/pull/143) Fix cli crash when `oc dev` reads a broken package.json (@andyroyle)
+
+### v0.19.1 2015/11/06
+- [#140](https://github.com/opentable/oc/pull/140) Hacking on travis (@matteofigus)
+
+### v0.19.0 2015/11/05
+- [#139](https://github.com/opentable/oc/pull/139) prerendered -> unrendered (@matteofigus)
+- [#134](https://github.com/opentable/oc/pull/134) Added tagging when upgrading version (@jankowiakmaria)
+- [#133](https://github.com/opentable/oc/pull/133) Empty component fix (@andyroyle)
+- [#132](https://github.com/opentable/oc/pull/132) have to actually call registry.register for the plugins (@andyroyle)
+- [#131](https://github.com/opentable/oc/pull/131) Mock plugins tests (@andyroyle)
+- [#130](https://github.com/opentable/oc/pull/130) add support for dynamic plugin mocks (@andyroyle)
+- [#125](https://github.com/opentable/oc/pull/125) Prevent infinite loops (@andyroyle)
+- [#127](https://github.com/opentable/oc/pull/127) Node version validation (@jankowiakmaria)
+- [#126](https://github.com/opentable/oc/pull/126) Client performance optimisations, readme, and cleanup (@matteofigus)
+- [#123](https://github.com/opentable/oc/pull/123) don't set reqinfo on this (@andyroyle)
+- [#122](https://github.com/opentable/oc/pull/122) Don't play with SauceLabs - downgrading all the stuff (@matteofigus)
+- [#120](https://github.com/opentable/oc/pull/120) first go at an interface for auth plugins (@andyroyle)
+- [#117](https://github.com/opentable/oc/pull/117) Some clean-up (@ajcw)
+- [#116](https://github.com/opentable/oc/pull/116) if creds are specified on the opts object, don't prompt for them (@andyroyle)
+- [#113](https://github.com/opentable/oc/pull/113) Added preventing old oc versions to publish (@matteofigus, @jankowiakmaria)
+- [#112](https://github.com/opentable/oc/pull/112) Added 'Updated' date field in web interface (#110) (@jankowiakmaria)
+- [#108](https://github.com/opentable/oc/pull/108) Little improvements (@matteofigus)
+- [#105](https://github.com/opentable/oc/pull/105) Preview refactoring (@matteofigus)
+- [#102](https://github.com/opentable/oc/pull/102) Hacking on web interface (@matteofigus)
+- [#103](https://github.com/opentable/oc/pull/103) publish step has an optional callback (@andyroyle)
+- [#104](https://github.com/opentable/oc/pull/104) pass options to registry to override at runtime (@andyroyle)
+- [#101](https://github.com/opentable/oc/pull/101) Adding some tests and refactoring server.js packaging (@matteofigus)
+- [#100](https://github.com/opentable/oc/pull/100) Execution timeout (@matteofigus)
+- [#99](https://github.com/opentable/oc/pull/99) Static subfolders packaging bugfix (@matteofigus)
+- [#98](https://github.com/opentable/oc/pull/98) Component execution error - more details and bugfix (@matteofigus)
+- [#97](https://github.com/opentable/oc/pull/97) Separating local dependencies and checking tab size (@matteofigus)
+- [#91](https://github.com/opentable/oc/pull/91) Adding 'troubleshooting' section (@matteofigus, @ajcw)
+- [#96](https://github.com/opentable/oc/pull/96) Fixed the oc.build functionality for client-side ie8 execution (@matteofigus)
+- [#94](https://github.com/opentable/oc/pull/94) Support minifying ie8 compatible css files (@char1e5)
+- [#81](https://github.com/opentable/oc/pull/81) Html components discovery #73 (@tpgmartin)
+- [#88](https://github.com/opentable/oc/pull/88) err message and stack are stored in getters which don't get resolved.… (@stevejhiggs)
+- [#86](https://github.com/opentable/oc/pull/86) Don't Watch Vim Swap Files (@todd)
+- [#85](https://github.com/opentable/oc/pull/85) Ruby gems links (@matteofigus)
+- [#83](https://github.com/opentable/oc/pull/83) Auto cli docs (@federicomaffei)
+- [#82](https://github.com/opentable/oc/pull/82) Zero number bugfix (@matteofigus)
+- [#80](https://github.com/opentable/oc/pull/80) Correct hashKey spelling (@tpgmartin)
+- [#68](https://github.com/opentable/oc/pull/68) Registry Plugins (@matteofigus)
+- [#79](https://github.com/opentable/oc/pull/79) Add a Gitter chat badge to README.md (@gitter-badger)
+- [#77](https://github.com/opentable/oc/pull/77) allow jade to render partials (@federicomaffei)
+- [#76](https://github.com/opentable/oc/pull/76) Sauce labs stabilization (@federicomaffei)
+- [#75](https://github.com/opentable/oc/pull/75) Autocomplete experiment (@jankowiakmaria)
+- [#74](https://github.com/opentable/oc/pull/74) specify registry from terminal (@tpgmartin)
+- [#67](https://github.com/opentable/oc/pull/67) Refactoring, cleanup (@matteofigus)
+- [#66](https://github.com/opentable/oc/pull/66) README update (@matteofigus)
+- [#65](https://github.com/opentable/oc/pull/65) server.js' req -> context (@matteofigus)
+- [#64](https://github.com/opentable/oc/pull/64) Upgrading dependencies (@matteofigus)
+- [#63](https://github.com/opentable/oc/pull/63) Fix etag (@matteofigus)
+- [#60](https://github.com/opentable/oc/pull/60) Auto install modules (@matteofigus, @andyroyle)
+- [#58](https://github.com/opentable/oc/pull/58) ignore failures in dev server when loading modules (@andyroyle)
+- [#59](https://github.com/opentable/oc/pull/59) Async refactoring (@matteofigus)
+- [#52](https://github.com/opentable/oc/pull/52) publish to all the registries listed in oc.json (@andyroyle)
+- [#57](https://github.com/opentable/oc/pull/57) Some tests in support of json require functionality (@matteofigus)
+- [#56](https://github.com/opentable/oc/pull/56) Enabling json local requires (@matteofigus)
+- [#55](https://github.com/opentable/oc/pull/55) Sauce labs hacking (@matteofigus)
+- [#54](https://github.com/opentable/oc/pull/54) Minify automagically component's static resources when publishing (@matteofigus)
+- [#53](https://github.com/opentable/oc/pull/53) Windows publish (@matteofigus)
+- [#50](https://github.com/opentable/oc/pull/50) Added oc.build functionality and tests (@matteofigus)
+- [#47](https://github.com/opentable/oc/pull/47) Testing (@matteofigus)
+- [#24](https://github.com/opentable/oc/pull/24) Docs Part I (@matteofigus, @jankowiakmaria)
+- [#46](https://github.com/opentable/oc/pull/46) Added preview functionality (@matteofigus)
+- [#45](https://github.com/opentable/oc/pull/45) karma (@matteofigus)
+- [#44](https://github.com/opentable/oc/pull/44) Added the container options on package to avoid container to be shown on... (@matteofigus)
+- [#43](https://github.com/opentable/oc/pull/43) Registry on refactoring (@matteofigus)
+- [#42](https://github.com/opentable/oc/pull/42) Cleanup (@matteofigus)
+- [#41](https://github.com/opentable/oc/pull/41) registry cache optimisations (@matteofigus)
+- [#40](https://github.com/opentable/oc/pull/40) Cleanup (@matteofigus)
+- [#39](https://github.com/opentable/oc/pull/39) S3 fix (@matteofigus)
+- [#37](https://github.com/opentable/oc/pull/37) Pre-rendered header -> accept application/vnd.oc.prerendered+json (@matteofigus)
+- [#35](https://github.com/opentable/oc/pull/35) Console log (@matteofigus)
+- [#32](https://github.com/opentable/oc/pull/32) Nodejs client (@matteofigus)
+- [#31](https://github.com/opentable/oc/pull/31) Div rendering (@matteofigus)
+- [#29](https://github.com/opentable/oc/pull/29) added command line parameter for template type (@federicomaffei)
+- [#28](https://github.com/opentable/oc/pull/28) throwing exception when registry is initialised with invalid conf #25 (@federicomaffei)
+- [#22](https://github.com/opentable/oc/pull/22) Ie 9-10 client-side rendering (@matteofigus)
+- [#21](https://github.com/opentable/oc/pull/21) Registry events (@matteofigus)
+- [#20](https://github.com/opentable/oc/pull/20) Added onRequest functionality on config + improved routing (@matteofigus)
+- [#18](https://github.com/opentable/oc/pull/18) Publish basic auth (@matteofigus)
+- [#14](https://github.com/opentable/oc/pull/14) 0.3.2 (@matteofigus)
+- [#11](https://github.com/opentable/oc/pull/11) Oc version fix (@matteofigus)
+- [#10](https://github.com/opentable/oc/pull/10) added oc version to component package (@federicomaffei)
+- [#4](https://github.com/opentable/oc/pull/4) Some fixes (@matteofigus)
+- [#3](https://github.com/opentable/oc/pull/3) Client componentisation (@matteofigus)
+- [#2](https://github.com/opentable/oc/pull/2) Update README.md (@federicomaffei)
+- [#1](https://github.com/opentable/oc/pull/1) Readme (@matteofigus)
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index c650431ad..b5a77b6d4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -25,7 +25,14 @@ module.exports = function(grunt){
   grunt.registerTask('test-local-silent', ['jshint:all', 'mochaTest:silent', 'karma:local']);
   grunt.registerTask('test', ['jshint:all', 'mochaTest:unit', 'mochaTest:acceptance']);
   grunt.registerTask('test-with-sauce', ['test', 'sauce']);
-  grunt.registerTask('git-stage', ['gitadd', 'gitcommit:version', 'gittag:addtag']);
+  grunt.registerTask('git-stage', [
+    'gitadd:versionFiles',
+    'gitcommit:version',
+    'gittag:addtag',
+    'githubChange',
+    'gitadd:changelog',
+    'gitcommit:changelog'
+  ]);
 
   grunt.registerTask('build', 'Builds and minifies the oc-client component', customTasks.build(grunt, taskObject));
   grunt.registerTask('generate-cli-doc', 'Automatically updates the cli.md file', customTasks.generateCliDoc);
diff --git a/components/oc-client/_package/package.json b/components/oc-client/_package/package.json
index a45b2eb7e..0fd98c7a2 100644
--- a/components/oc-client/_package/package.json
+++ b/components/oc-client/_package/package.json
@@ -1 +1 @@
-{"name":"oc-client","description":"The OpenComponents client-side javascript client","version":"0.28.2","repository":"https://github.com/opentable/oc/tree/master/components/oc-client","author":"Matteo Figus <matteofigus@gmail.com>","oc":{"container":false,"renderInfo":false,"minify":false,"parameters":{},"files":{"template":{"type":"handlebars","hashKey":"bb774de6a2b7280c2b66103bd36d7e708a1b7541","src":"template.js"},"static":["src"],"dataProvider":{"type":"node.js","hashKey":"ffb0e43eaf72f55fa13dc1e7262019c14c3dfc81","src":"server.js"}},"version":"0.28.2","packaged":true,"date":1457635900218}}
+{"name":"oc-client","description":"The OpenComponents client-side javascript client","version":"0.28.2","repository":"https://github.com/opentable/oc/tree/master/components/oc-client","author":"Matteo Figus <matteofigus@gmail.com>","oc":{"container":false,"renderInfo":false,"minify":false,"parameters":{},"files":{"template":{"type":"handlebars","hashKey":"bb774de6a2b7280c2b66103bd36d7e708a1b7541","src":"template.js"},"static":["src"],"dataProvider":{"type":"node.js","hashKey":"ffb0e43eaf72f55fa13dc1e7262019c14c3dfc81","src":"server.js"}},"version":"0.28.2","packaged":true,"date":1457655286845}}
diff --git a/grunt-tasks/gitadd.js b/grunt-tasks/gitadd.js
index ac4d982ff..e32eaa02f 100644
--- a/grunt-tasks/gitadd.js
+++ b/grunt-tasks/gitadd.js
@@ -1,7 +1,14 @@
 'use strict';
 
 module.exports = {
-  files: {
-    src: ['.']
+  versionFiles: {
+    files: {
+      src: ['.']
+    }
+  },
+  changelog: {
+    files: {
+      src: ['CHANGELOG.md']
+    }
   }
 };
diff --git a/grunt-tasks/gitcommit.js b/grunt-tasks/gitcommit.js
index d5968c50a..33f6d9ef2 100644
--- a/grunt-tasks/gitcommit.js
+++ b/grunt-tasks/gitcommit.js
@@ -8,5 +8,13 @@ module.exports = {
     files: {
       src: ['.']
     }
+  },
+  changelog: {
+    options: {
+      message: 'changelog',
+    },
+    files: {
+      src : ['.']
+    }
   }
 };
diff --git a/grunt-tasks/githubChanges.js b/grunt-tasks/githubChanges.js
new file mode 100644
index 000000000..e7e7180c7
--- /dev/null
+++ b/grunt-tasks/githubChanges.js
@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports = {
+  dist : {
+    options: {
+      owner : 'opentable',
+      repository : 'oc',
+      file: 'CHANGELOG.md',
+      onlyPulls: true,
+      useCommitBody: true,
+      dateFormat: 'YYYY/MM/DD'
+    }
+  }
+};
\ No newline at end of file
diff --git a/package.json b/package.json
index c7ce84b1b..b3135e8bd 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "grunt": "0.4.5",
     "grunt-contrib-jshint": "0.10.0",
     "grunt-git": "0.3.5",
+    "grunt-github-changes": "0.1.0",
     "grunt-karma": "0.10.1",
     "grunt-mocha-test": "0.12.7",
     "injectr": "0.5.1",