diff --git a/404.md b/404.md
index 3fd2047a67..13f53550a7 100644
--- a/404.md
+++ b/404.md
@@ -6,10 +6,17 @@ permalink: /404.html
 
 <script language="JavaScript">
 $( document ).ready(function() {
-  if (window.location.href.indexOf(".html") > -1) {
-    var forwardingURL=window.location.href.replace(".html","").replace("/v1.1","").replace("/v1.0","");
-    window.location.replace(forwardingURL);
+  var oldURLs=[".html",".md","/v1.1","/v1.0","README"];
+  var doRedirect=false;
+  var forwardingURL=window.location.href;
+  for (i=0;i<oldURLs.length;i++) {
+    if (window.location.href.indexOf(oldURLs[i]) > -1) {
+      doRedirect=true;
+      forwardingURL=forwardingURL.replace(oldURLs[i]);
+    }
   }
+  if (doRedirect) window.location.replace(forwardingURL);
+}
 });
 </script>