diff --git a/www/errorpage.html b/www/errorpage.html
index 0724ce406..13ba4d1c7 100644
--- a/www/errorpage.html
+++ b/www/errorpage.html
@@ -1,19 +1,56 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<html><head>
-<title>404 Not Found</title>
-</head><body>
-<h1>Not Found</h1>
-<p>The requested URL was not found on this server.</p>
-<p>Note that this server was set up recently and does not contain any
-OpenStack content published before October 2016. Historic
-documentation content
-is available from <a href="http://developer.openstack.org/">the
-archived developer.openstack.org site</a>.
-<!-- Note: This above URL needs changing once we switch over
- to the new site -->
-<p>In case you find missing content, feel free
-to <a href="https://bugs.launchpad.net/openstack-api-site/+filebug">report
-a bug</a>.
-<p>Go back to the <a href="/">main OpenStack developer site.</p>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
+{% set scriptdir = './common/js/' %}
+{% set cssdir = './common/css/' %}
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>404 Not Found</title>
+<!-- CSS in: {{ cssdir }}-->
+{% include 'templates/css.tmpl' %}
+{% block content %}
+<!-- Begin Page Content -->
+<div class="top-docs-wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-8 col-md-8 col-sm-8">
+            <h1>Not Found</h1>
+            <p>The requested URL was not found on this server.</p>
+            <p>Note that this server was set up recently and does not contain any
+            OpenStack content published before October 2016. Historic
+            documentation content
+            is available from <a href="http://developer.openstack.org/">the
+            archived developer.openstack.org site</a>.
+            <!-- Note: This above URL needs changing once we switch over
+             to the new site -->
+
+            <a href="/">
+                            <img src="http://www.openstack.org/errors_pages/ui/404/images/404.svg"
+                                 onerror="this.onerror=null; this.src=http://www.openstack.org/errors_pages/ui/404/images/404.png" alt="OpenStack 404 Page">
+                        </a>
+
+            <p>In case you find missing content, feel free
+            to <a href="https://bugs.launchpad.net/openstack-api-site/+filebug">report
+            a bug</a>.
+            <p>You can always go back to the <a href="/">main OpenStack documentation site.</p>
+             <p>Or, try one of these instead.
+            </p>
+
+            <div class="four-o-four-links">
+                <a href="https://www.openstack.org/software">Software</a>
+                <a href="https://www.openstack.org/users">Users</a>
+                <a href="https://www.openstack.org/community">Community</a>
+                <a href="https://www.openstack.org/marketplace">Marketplace</a>
+                <a href="https://www.openstack.org/events">Events</a>
+                <a href="https://www.openstack.org/blog">Blog</a>
+                <a href="http://docs.openstack.org">Docs</a>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- End Page Content -->
+{% endblock content %}
+{% include 'templates/google_analytics.tmpl' %}
diff --git a/www/templates/google_analytics.tmpl b/www/templates/google_analytics.tmpl
new file mode 100644
index 000000000..14de3694e
--- /dev/null
+++ b/www/templates/google_analytics.tmpl
@@ -0,0 +1,18 @@
+    <!-- Google Analytics -->
+    <script>
+     //<![CDATA[
+
+     var _gaq = _gaq || [];
+     _gaq.push(['_setAccount', 'UA-17511903-1']);
+     _gaq.push(['_setDomainName', '.openstack.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>
+    <!-- End Google Analytics -->
\ No newline at end of file
diff --git a/www/templates/indexbase.tmpl b/www/templates/indexbase.tmpl
index 44615ce9f..f5ee995c6 100644
--- a/www/templates/indexbase.tmpl
+++ b/www/templates/indexbase.tmpl
@@ -10,24 +10,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <!-- CSS in: {{ cssdir }}-->
     {% include 'templates/css.tmpl' %}
-    <!-- Google Analytics -->
-    <script>
-     //<![CDATA[
-
-     var _gaq = _gaq || [];
-     _gaq.push(['_setAccount', 'UA-17511903-1']);
-     _gaq.push(['_setDomainName', '.openstack.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>
-    <!-- End Google Analytics -->
+    {% include 'templates/google_analytics.tmpl' %}
   </head>
   <body>
     {% include 'templates/header.tmpl' %}
