diff --git a/libraries/geos/geos.SlackBuild b/libraries/geos/geos.SlackBuild
index 1fbe50f79f..857c7e2821 100644
--- a/libraries/geos/geos.SlackBuild
+++ b/libraries/geos/geos.SlackBuild
@@ -5,10 +5,20 @@
 
 PRGNAM=geos
 VERSION=${VERSION:-3.0.4}
-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) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM-$VERSION
@@ -23,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -53,7 +66,7 @@ CXXFLAGS="$SLKCFLAGS" \
 	--enable-shared \
 	--disable-static \
 	--enable-python \
-	--enable-ruby \
+	--disable-ruby \
 	--build=$ARCH-slackware-linux
 
 make