diff --git a/404.html b/404.html
deleted file mode 100644
index 7cf3044..0000000
--- a/404.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-		<title>Amahi Installation - Amahi Home Server Docs</title>
-		<link rel="icon" type="image/png" href="static/images/favicon.png" />
-		<meta name="description" content="Amahi Installation Documentation" />
-		<link rel="stylesheet" href="static/css/bootstrap.css" type="text/css" media="screen" />
-		<link rel="stylesheet" href="static/css/syntax.css" type="text/css" media="screen" />
-		<link rel="stylesheet" href="static/css/amahi.base.css" type="text/css" media="screen" />
-		<script type="text/javascript">
-			var _gaq = _gaq || [];
-			_gaq.push(['_setAccount', 'UA-XXXXXXXX-1']);
-			_gaq.push(['_setDomainName', 'install.amahi.org']);
-			_gaq.push(['_trackPageview']);
-
-			(function() {
-			 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			 })();
-</script>
-</head>
-<body>
-	<div class="container">
-		<div class="row Header">
-			<div class="span3 Module logo">
-				<h1><a href="/">Amahi</a></h1>
-			</div>
-			<div class="span9">
-				<div class="Module navigation">
-					<ul>
-						<li><a href="u12/index.html">get started</a></li>
-						<li><a href="http://www.amahi.org/">Amahi</a></li>
-						<li><a href="http://wiki.amahi.org">Wiki</a></li>
-						<li><a href="http://www.amahi.org/users">control panel</a></li>
-					</ul>
-				</div>
-			</div>
-		</div>
-
-		<div class="row">
-			<div class="span12">
-
-  <div class="span9">
-    <h1 id='requirements'>404 - Not Found!</h1>
-
-<p>The page yuou we were looking for is not found. Try again!</p>
-
-    <ul class="pager">
-    
-    
-    </ul>
-  </div>
-      </div>
-    </div>
-
-    <div class="row Footer">
-      <div class="span12">
-	      &copy; 2015 <a href="http://www.amahi.org/">Amahi</a> | <a href="http://wiki.amahi.org/">Wiki</a> | <a href="http://blog.amahi.org/">Blog</a> | <a href="http://forums.amahi.org/">Forums</a> | <a href="http://bugs.amahi.org/">Bug Tracker</a>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/404.md b/404.md
new file mode 100644
index 0000000..d0fe145
--- /dev/null
+++ b/404.md
@@ -0,0 +1,11 @@
+---
+layout: homepage
+title: 404 - Not Found!
+permalink: /404.html
+---
+
+# 404 - Not Found! 
+
+The page you were looking for was not found. Try again!
+
+If a page on the Amahi site is directing you to a page that does not exist, [please file an issue against website in our bug tracker.](https://bugs.amahi.org/issues/new)
