diff --git a/www/rustup.js b/www/rustup.js
index 2b42542556..46450c2897 100644
--- a/www/rustup.js
+++ b/www/rustup.js
@@ -1,5 +1,9 @@
 var platform_override = null;
 
+function android_or_unix() {
+  return (navigator.appVersion.indexOf("Android") != -1) ? "android" : "unix";
+}
+
 function detect_platform() {
     "use strict";
 
@@ -10,12 +14,14 @@ function detect_platform() {
     var os = "unknown";
 
     if (navigator.platform == "Linux x86_64") {os = "unix";}
-    if (navigator.platform == "Linux i686") {os = "unix";}
+    if (navigator.platform == "Linux i686") {os = android_or_unix();}
     if (navigator.platform == "Linux i686 on x86_64") {os = "unix";}
-    if (navigator.platform == "Linux aarch64") {os = "unix";}
-    if (navigator.platform == "Linux armv6l") {os = "unix";}
-    if (navigator.platform == "Linux armv7l") {os = "unix";}
+    if (navigator.platform == "Linux aarch64") {os = android_or_unix();}
+    if (navigator.platform == "Linux armv6l") {os = android_or_unix();}
+    if (navigator.platform == "Linux armv7l") {os = android_or_unix();}
     if (navigator.platform == "Linux ppc64") {os = "unix";}
+    if (navigator.platform == "Linux mips") {os = "unix";}
+    if (navigator.platform == "Linux mips64") {os = "unix";}
     if (navigator.platform == "Mac") {os = "unix";}
     if (navigator.platform == "Win32") {os = "win";}
     if (navigator.platform == "FreeBSD x86_64") {os = "unix";}
@@ -23,11 +29,6 @@ function detect_platform() {
     if (navigator.platform == "NetBSD x86_64") {os = "unix";}
     if (navigator.platform == "NetBSD amd64") {os = "unix";}
 
-    if (navigator.platform == "Linux armv7l"
-        && navigator.appVersion.indexOf("Android") != -1 ) {
-        os = "android";
-    }
-
     // I wish I knew by now, but I don't. Try harder.
     if (os == "unknown") {
         if (navigator.appVersion.indexOf("Win")!=-1) {os = "win";}