diff --git a/404.md b/404.md
index b1b3b602e5..f1667faa97 100644
--- a/404.md
+++ b/404.md
@@ -6,7 +6,7 @@ permalink: /404.html
 <script language="JavaScript">
 $( document ).ready(function() {
   var oldURLs=["/README.md","/README.html",".html",".md","/v1.1/","/v1.0/"];
-  var fwdDirs=["examples/","cluster/","docs/devel/"];
+  var fwdDirs=["examples/","cluster/","docs/devel","docs/design"];
   var doRedirect = false;
   var notHere = false;
   var forwardingURL=window.location.href;
@@ -15,10 +15,10 @@ $( document ).ready(function() {
     notHere = true;
     window.location.replace("http://kubernetes.io/kubernetes/third_party/swagger-ui/");
   }
-  if (forwardingURL.indexOf("docs/design") > -1)
+  if (forwardingURL.indexOf("docs/roadmap") > -1)
   {
     notHere = true;
-    window.location.replace("https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/docs/design");
+    window.location.replace("https://github.com/kubernetes/kubernetes/milestones/");
   }
   if (forwardingURL.indexOf("api-ref/") > -1) 
   {