diff --git a/404.md b/404.md
index 992c0d8580..c7d985294e 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/","docs/design/"];
+  var fwdDirs=["examples/","cluster/"];
   var doRedirect = false;
   var notHere = false;
   var forwardingURL=window.location.href;
@@ -15,6 +15,17 @@ $( document ).ready(function() {
     notHere = true;
     window.location.replace("http://kubernetes.io/kubernetes/third_party/swagger-ui/");
   }
+  if (forwardingURL.indexOf("docs/design") > -1)
+  {
+    notHere = true;
+    var urlPieces = forwardingURL.split("docs/design");
+    if (urlPieces[1].charAt(urlPieces[1].length)=="/") {
+      urlPieces[1] = urlPieces[1].substring(0, urlPieces[1].length - 1);
+      urlPieces[1] = urlPieces[1] + ".md";
+    }
+    var newURL = "https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/docs/design/" + urlPieces[1]
+    window.location.replace("http://kubernetes.io/kubernetes/third_party/swagger-ui/");
+  }
   if (forwardingURL.indexOf("api-ref/") > -1) 
   {
     notHere = true;