diff --git a/app/router.coffee b/app/router.coffee
index 24d337ef..22be0a06 100644
--- a/app/router.coffee
+++ b/app/router.coffee
@@ -52,7 +52,6 @@ Router.map ->
       @resource 'account', path: '/:login'
       @route 'info', path: '/info'
 
-  @route 'error500', path: '/500'
   @route 'error404', path: '/*path'
 
 `export default Router`
diff --git a/app/templates/error500.hbs b/app/templates/error500.hbs
deleted file mode 100644
index de15327b..00000000
--- a/app/templates/error500.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="error-bg full-size">
-  <div class="hill-left full-size"></div>
-  <div class="hill-right full-size"></div>
-  <div class="shadow-left full-size"></div>
-  <div class="shadow-right full-size"></div>
-  <div class="road full-size"></div>
-</div>
-<div class="error-text">
-  <h1>Something went wrong</h1>
-  <p>It looks like something went wrong with your request.<br>Please try again later.</p>
-</div>
diff --git a/app/views/error500.coffee b/app/views/error500.coffee
deleted file mode 100644
index c6b7dfb2..00000000
--- a/app/views/error500.coffee
+++ /dev/null
@@ -1,7 +0,0 @@
-`import BasicView from 'travis/views/basic'`
-
-View = BasicView.extend
-  layoutName: 'layouts/error'
-  classNames: ['error error500']
-
-`export default View`
diff --git a/public/500.html b/public/500.html
new file mode 100644
index 00000000..6efdc791
--- /dev/null
+++ b/public/500.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Travis CI - 500</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,800" rel="stylesheet" type="text/css">
+    <link rel="stylesheet" href="../assets/travis.css">
+
+  </head>
+  <body>
+    <div class="application">
+      <div class="ember-view error error500">
+        <div id="top">
+          <div class="row">
+            <div class="small-2 medium-2 columns" id="logo">
+              <h1><a href="/" class="ember-view">Home</a></h1>
+            </div>
+            <ul id="navigation">
+              <li><a href="http://blog.travis-ci.com/">Blog</a></li>
+              <li><a href="http://www.traviscistatus.com/">Status</a></li>
+            </ul>
+          </div>
+        </div>
+        <main class="main main--error" role="main">
+            <div class="error-bg full-size">
+            <div class="hill-left full-size"></div>
+            <div class="hill-right full-size"></div>
+            <div class="shadow-left full-size"></div>
+            <div class="shadow-right full-size"></div>
+            <div class="road full-size"></div>
+          </div>
+          <div class="error-text">
+            <h1>Something went wrong</h1>
+            <p>It looks like something went wrong with your request.<br>Please try again later.</p>
+          </div>
+          </main>
+      </div>
+    </div>
+  </body>
+</html>
