diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc7360c4..aa275c47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+<a name="0.4.0"></a>
+# 0.4.0 (2016-07-12)
+
+### Bug Fixes
+
+* Make source files generated correctly (thanks to @AlbertXingZhang)
+* Fix docker configuration (thanks to @gavinzhou)
+
+### Features
+
+* Angular updated to rc.4
+* Dependencies updated accordingly
+* Angular Component Router instead or Router Deprecated (thanks to @RonnyRoos)
+* New Angular Forms
+* Sidebar rewritten, menu merged with routes configuration
+* New CKEditor component
+* New Image Uploader component
+* New Three view component
+* New Rating component
+* New Checkbox and multi-checkbox component
+
+### BREAKING CHANGES
+
+* Router is updated to Angular Router Component. Old beta router is removed.
+That means that all the routes are moved to the `src/app/app.routes.ts` file. `src/app/app.menu.ts` is also merged into the routes configuration.
+More details on how to configure a new route you can find [here](https://akveo.github.io/ng2-admin/articles/015-sidebar/).
+
+* Forms are updated as well. Thus you need to reconfigure all your forms to use new Angular Forms. Checkout the `src/app/pages/login/login.component.ts`component for more details and example.
+
+### How to update
+
+* run `npm install`
+
+
 <a name="0.3.0"></a>
 # 0.3.0 (2016-06-29)