diff --git a/network/aria2/aria2.SlackBuild b/network/aria2/aria2.SlackBuild
index 68e55564b1..5f7339bbcc 100644
--- a/network/aria2/aria2.SlackBuild
+++ b/network/aria2/aria2.SlackBuild
@@ -4,13 +4,22 @@
 
 PRGNAM=${PRGNAM:-aria2}
 VERSION=${VERSION:-1.9.1}
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 HTTPS=${HTTPS:-gnutls}
 XML=${XML:-libxml2}
 
+# 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
@@ -28,6 +37,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
    SLKCFLAGS="-O2 -fPIC"
    LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi 
 
 set -e