diff --git a/network/ufw/ufw.SlackBuild b/network/ufw/ufw.SlackBuild
index 1c8e2353c3..f6961f6af6 100644
--- a/network/ufw/ufw.SlackBuild
+++ b/network/ufw/ufw.SlackBuild
@@ -4,10 +4,19 @@
 
 PRGNAM=ufw	
 VERSION=${VERSION:-0.27}
-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