diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c578fcc3e..00f294f87f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+<a name="v4.0.4"></a>
+### v4.0.4 (2017-04-04)
+
+
+#### Bug Fixes
+
+* **6123:** Allowing selection and tree-base to build columns. ([2ea9a06e](http://github.com/angular-ui/ng-grid/commit/2ea9a06e594601cc44947a997f08bce628e813f4))
+* **flatEntityAccess:**  getCellDisplayValue now returns the correct value. ([ba77c875](http://github.com/angular-ui/ng-grid/commit/ba77c8750431236ff4f729fe8a77eb44cbbfc9b7))
+
+
+#### Features
+
+* **japanese:** Update japanese translation. ([47e78d1](https://github.com/angular-ui/ui-grid/commit/47e78d16710a96033c692f800c5bb4874f694fc8))
+
 <a name="v4.0.3"></a>
 ### v4.0.3 (2017-03-24)
 
diff --git a/bower.json b/bower.json
index d9c69d6db6..80ad446fb6 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-grid",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "homepage": "http://ui-grid.info",
   "repository": {
     "type": "git",
diff --git a/package.json b/package.json
index b02cda37f1..8fb7febc6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui-grid",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "A data grid for Angular",
   "directories": {
     "test": "test"