diff --git a/functions.sh b/functions.sh
index d007db2f..341a23d6 100644
--- a/functions.sh
+++ b/functions.sh
@@ -41,8 +41,9 @@ case "$(uname -i)" in
 #  arm*)
 #    echo "ARM system architecture"
 #    SYSTEM_ARCH="";;
-  unknown|AuthenticAMD|GenuineIntel)
-#         uname -i not answer on debian, then:
+  *)
+    # uname '-i' isn't portable so when failing, fall back to uname's
+    # recommended switch '-m':
     case "$(uname -m)" in
       x86_64|amd64)
 #        echo "x86-64 system architecture"
@@ -50,10 +51,13 @@ case "$(uname -i)" in
       i?86)
 #        echo "x86 system architecture"
         SYSTEM_ARCH="i686";;
+#      arm*|aarch*)
+#         echo "ARM system architecture"
+#        SYSTEM_ARCH="";;
+      *)
+        echo "Unsupported system architecture: $(uname -m)"
+        exit 1;;
     esac ;;
-  *)
-    echo "Unsupported system architecture"
-    exit 1;;
 esac
 
 # Either get the file from remote or from a static place.