diff --git a/app.js b/app.js
index 0d33804b36..537245e1b9 100755
--- a/app.js
+++ b/app.js
@@ -39,6 +39,10 @@ app.use(flash());
 app.use(less({ src: __dirname + '/public', compress: true }));
 app.use(app.router);
 app.use(express.static(path.join(__dirname, 'public')));
+app.use(function(req, res) {
+  res.status(404);
+  res.render('404');
+});
 
 // Development only
 if ('development' === app.get('env')) {
diff --git a/views/404.jade b/views/404.jade
new file mode 100644
index 0000000000..4a3481efca
--- /dev/null
+++ b/views/404.jade
@@ -0,0 +1,48 @@
+doctype  5
+html
+  head
+    title The page you were looking for doesn't exist (404)
+    style
+      body {
+        background-color: #EFEFEF;
+        color: #2E2F30;
+        text-align: center;
+        font-family: arial, sans-serif;
+      }
+      div.dialog {
+        width: 25em;
+        margin: 4em auto 0 auto;
+        border: 1px solid #CCC;
+        border-right-color: #999;
+        border-left-color: #999;
+        border-bottom-color: #BBB;
+        border-top: #B00100 solid 4px;
+        border-top-left-radius: 9px;
+        border-top-right-radius: 9px;
+        background-color: white;
+        padding: 7px 4em 0 4em;
+      }
+      h1 {
+        font-size: 100%;
+        color: #730E15;
+        line-height: 1.5em;
+      }
+      body > p {
+        width: 33em;
+        margin: 0 auto 1em;
+        padding: 1em 0;
+        background-color: #F7F7F7;
+        border: 1px solid #CCC;
+        border-right-color: #999;
+        border-bottom-color: #999;
+        border-bottom-left-radius: 4px;
+        border-bottom-right-radius: 4px;
+        border-top-color: #DADADA;
+        color: #666;
+        box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+      }
+  body
+    .dialog
+      h1 The page you were looking for doesn't exist.
+      p You may have mistyped the address or the page may have moved.
+    p If you are the application owner check the logs for more information.