diff --git a/desktop/whaw/whaw.SlackBuild b/desktop/whaw/whaw.SlackBuild
index d55d136b39..13b3dc757e 100644
--- a/desktop/whaw/whaw.SlackBuild
+++ b/desktop/whaw/whaw.SlackBuild
@@ -5,10 +5,19 @@
 
 PRGNAM=whaw
 VERSION=0.1.2
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM