diff --git a/network/openvas-client/openvas-client.SlackBuild b/network/openvas-client/openvas-client.SlackBuild
index 1a98b6258b..36677b6803 100644
--- a/network/openvas-client/openvas-client.SlackBuild
+++ b/network/openvas-client/openvas-client.SlackBuild
@@ -25,10 +25,19 @@
 
 PRGNAM=openvas-client
 VERSION=${VERSION:-3.0.0}
-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