diff --git a/404.md b/404.md
index c2f0b4d6c1..1803f19d16 100644
--- a/404.md
+++ b/404.md
@@ -6,15 +6,20 @@ permalink: /404.html
 <script language="JavaScript">
 $( document ).ready(function() {
   var oldURLs=["/README.md","/README.html",".html",".md","/v1.1/","/v1.0/"];
-  var fwdDirs=["examples/","third_party/swagger-ui"];
+  var fwdDirs=["examples/"];
   var doRedirect = false;
   var notHere = false;
   var forwardingURL=window.location.href;
+  if (forwardingURL.indexOf("third_party/swagger-ui") > -1)
+  {
+    notHere = true;
+    window.location.replace(http://kubernetes.io/kubernetes/third_party/swagger-ui/)
+  }
   for (i=0;i<fwdDirs.length;i++) {
     if (forwardingURL.indexOf(fwdDirs[i]) > -1)
     {
       var urlPieces = forwardingURL.split(fwdDirs[i]);
-      var newURL = "https://github.com/kubernetes/kubernetes/{{page.githubbranch}}/master/" + fwdDirs[i] + urlPieces[1];
+      var newURL = "https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/" + fwdDirs[i] + urlPieces[1];
       notHere = true;
       window.location.replace(newURL);
     }