diff --git a/libraries/perl-html-tagset/perl-html-tagset.SlackBuild b/libraries/perl-html-tagset/perl-html-tagset.SlackBuild
index a3da79b51a..bb22e9e41e 100644
--- a/libraries/perl-html-tagset/perl-html-tagset.SlackBuild
+++ b/libraries/perl-html-tagset/perl-html-tagset.SlackBuild
@@ -26,10 +26,19 @@
 PRGNAM=perl-html-tagset
 SRC_PRGNAM=HTML-Tagset
 VERSION=${VERSION:-3.20}
-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