diff --git a/libraries/libgig/libgig.SlackBuild b/libraries/libgig/libgig.SlackBuild
index 75de8a1e89..b11f5ab7c5 100644
--- a/libraries/libgig/libgig.SlackBuild
+++ b/libraries/libgig/libgig.SlackBuild
@@ -4,10 +4,19 @@
 
 PRGNAM=libgig
 VERSION=${VERSION:-3.3.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
@@ -22,6 +31,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e