diff --git a/network/noip2/noip2.SlackBuild b/network/noip2/noip2.SlackBuild
index 4de936d8dc..6088add985 100644
--- a/network/noip2/noip2.SlackBuild
+++ b/network/noip2/noip2.SlackBuild
@@ -27,10 +27,20 @@
 PRGNAM=noip2
 SRCNAM=noip
 VERSION=2.1.9
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
-TAG=${TAG=_SBO}
-CWD=`pwd`
+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
 OUTPUT=${OUTPUT:-/tmp}