diff --git a/templates/500.html b/templates/500.html
index 65d5dabaf..5c03fcb13 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -86,6 +86,19 @@
       <h4>
         We're currently working to fix the problem, but if its persists please feel free to <a href="/contact">contact us</a>. In the meantime, try a refreshing drink (or just refreshing).
       </h4>
+
+      <div style="margin-top: 20px">
+        Current Service Status:
+        <span id="status-elem">(Loading)</span>
+      </div>
+
+      <script type="text/javascript" src="//statuspage-production.s3.amazonaws.com/se.js"></script>
+      <script type="text/javascript">
+        window.fetchStatusPage({
+          pageId: '8szqd6w4s277',
+          renderTo: '#status-elem'
+        });
+      </script>
     </div>
   </body>
 </html>
diff --git a/templates/base.html b/templates/base.html
index 228cb2742..17ffe4ac0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -101,6 +101,7 @@ mixpanel.init("{{ mixpanel_key }}", { track_pageview : false, debug: {{ is_debug
                 <li><a href="/security/" target="_self">Security</a></li>
                 <li><a href="/about/" target="_self">About</a></li>
                 <li><b><a href="/contact/" target="_self">Contact</a></b></li>
+                <li><b><a href="http://status.quay.io" target="_self">Service Status</a></b></li>
               </ul>
             </div>