diff --git a/404.html b/404.html
deleted file mode 100644
index 6ce0665..0000000
--- a/404.html
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: default
----
-
-<style type="text/css" media="screen">
-    .container {
-        margin: 10px auto;
-        max-width: 600px;
-        text-align: center;
-    }
-
-    h1 {
-        margin: 30px 0;
-        font-size: 4em;
-        line-height: 1;
-        letter-spacing: -1px;
-    }
-</style>
-
-<div class="container">
-    <h1>404</h1>
-
-    <p><strong>Page not found :(</strong></p>
-    <p>The requested page could not be found.</p>
-</div>
diff --git a/_pages/404.md b/_pages/404.md
new file mode 100644
index 0000000..742fc77
--- /dev/null
+++ b/_pages/404.md
@@ -0,0 +1,12 @@
+---
+permalink:      "/404.html"
+layout:         page
+sidebar:        false
+id:             404
+title:          "404: Page not found"
+description:    ""
+---
+
+Sorry, we've misplaced that URL or it's pointing to something that doesn't exist.
+[Head back home]({{ site.baseurl | uri_escape }})
+to try finding it again.