diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade
index 0b23cfc5ba..7138f75b8f 100644
--- a/views/challengeMap/show.jade
+++ b/views/challengeMap/show.jade
@@ -2,6 +2,9 @@ extends ../layout
 block content
     script.
         var completedChallenges = !{JSON.stringify(completedChallengeList)};
+    .bg-danger.default-border-radius
+        p     
+            a(href='https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/August-2015-Server-Maintenance' target='_blank') We're changing servers for the next few minutes. Please note that from now until this message goes away, newly created accounts and camper progress may be lost. Thank you for your patience.
     .panel.panel-info
         .panel-heading.text-center
             h1 Challenge Map
diff --git a/views/home.jade b/views/home.jade
index 7b25a30777..85165761ce 100644
--- a/views/home.jade
+++ b/views/home.jade
@@ -1,5 +1,8 @@
 extends layout
 block content
+    .bg-danger.default-border-radius
+        p     
+            a(href='https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/August-2015-Server-Maintenance' target='_blank') We're changing servers for the next few minutes. Please note that from now until this message goes away, newly created accounts and camper progress may be lost. Thank you for your patience.
     .jumbotron
         .text-center
             h1.hug-top Code with Us