diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index e17826e..0c3c209 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,3 +1,5 @@
+* 0.5.1
+  * fixed issue with the production build (404 at first render)
 * 0.5.0
   * upgraded dependencies to support TypeScript 1.8.x
 * 0.4.1
diff --git a/README.md b/README.md
index b96e2d3..7918779 100644
--- a/README.md
+++ b/README.md
@@ -786,6 +786,7 @@ Check out [gulp-inline-source](https://www.npmjs.com/package/gulp-inline-source)
 * event-stream: construct pipes of streams of events: https://www.npmjs.com/package/event-stream
 * connect-history-api-fallback: useful to automatically redirect all non-existent directories to the index file; required for SPAs: https://www.npmjs.com/package/connect-history-api-fallback
 * karma: unit test runner: https://www.npmjs.com/package/karma
+* gulp-wait: Wait :): https://www.npmjs.com/package/gulp-wait
 
 ## Contributing
 * Fork the project
diff --git a/UPGRADE.MD b/UPGRADE.MD
index 29bb764..8527fb1 100644
--- a/UPGRADE.MD
+++ b/UPGRADE.MD
@@ -1,5 +1,8 @@
 # Upgrade guide
 
+## From 0.5.0 to 0.5.1
+No modification mandatory with this release.
+
 ## From 0.4.1 to 0.5.0
 You should upgrade your dependency on TypeScript to 1.8.x
 
diff --git a/package.json b/package.json
index 23fc791..5d38d5b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "modern-web-dev-build",
   "description": "Modern Web Development Build.",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "author": {
     "name": "Sebastien Dubois",
     "email": "seb@dsebastien.net",
@@ -79,6 +79,7 @@
     "gulp-uglify": "1.5.x",
     "gulp-uncss": "1.0.x",
     "gulp-util": "3.0.x",
+    "gulp-wait": "0.0.2",
     "jshint-stylish": "2.1.x",
     "node-sass": "3.4.x",
     "opn": "4.0.x",
diff --git a/src/gulp/tasks/serve-dist.js b/src/gulp/tasks/serve-dist.js
index 83fdc5d..6f27292 100644
--- a/src/gulp/tasks/serve-dist.js
+++ b/src/gulp/tasks/serve-dist.js
@@ -3,6 +3,7 @@
 import AbstractTaskLoader from "../abstractTaskLoader";
 import config from "../config";
 //import utils from "../utils";
+import wait from "gulp-wait";
 
 const browserSync = require("browser-sync").create(config.webServerNames.dist);
 
@@ -46,9 +47,14 @@ class ServeDistTaskLoader extends AbstractTaskLoader {
                 reloadDebounce: 1000
             });
         };
+        
+        gulp.task("wait-a-bit", "Wait a second...", () => {
+            return gulp.src('./package.json').
+                pipe(wait(1500))
+        });
 
         gulp.task("serve-dist", "Build and serve the production version (i.e., 'dist' folder contents", () =>{
-            return runSequence([ "default" ], startBrowserSync); // here we need to ensure that all the other tasks are done before we start BrowserSync
+            return runSequence([ "default" ], ["wait-a-bit"], startBrowserSync); // here we need to ensure that all the other tasks are done before we start BrowserSync
         });
     }
 }