diff --git a/addon/ng2/commands/github-pages-deploy.ts b/addon/ng2/commands/github-pages-deploy.ts
index f53279238c97..8ac1478c1e6f 100644
--- a/addon/ng2/commands/github-pages-deploy.ts
+++ b/addon/ng2/commands/github-pages-deploy.ts
@@ -172,7 +172,10 @@ module.exports = Command.extend({
       let indexHtml = path.join(root, 'index.html');
       return fsReadFile(indexHtml, 'utf8')
         .then((data) => data.replace(/<base href="\/">/g, `<base href="/${projectName}/">`))
-        .then((data) => fsWriteFile(indexHtml, data, 'utf8'));
+        .then((data) => {
+          fsWriteFile(indexHtml, data, 'utf8');
+          fsWriteFile(path.join(root, '404.html'), data, 'utf8');
+        });
     }
 
     function addAndCommit() {