diff --git a/libraries/libunique/libunique.SlackBuild b/libraries/libunique/libunique.SlackBuild
index 63872d15e7..079f30fa09 100644
--- a/libraries/libunique/libunique.SlackBuild
+++ b/libraries/libunique/libunique.SlackBuild
@@ -6,10 +6,19 @@
 
 PRGNAM=libunique
 VERSION=${VERSION:-1.1.6}
-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
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
diff --git a/libraries/libunique/slack-desc b/libraries/libunique/slack-desc
index 0a9cac9540..298bba7fcf 100644
--- a/libraries/libunique/slack-desc
+++ b/libraries/libunique/slack-desc
@@ -7,13 +7,13 @@
 
          |-----handy-ruler------------------------------------------------------|
 libunique: libunique (a library for writing single instance applications)
-libunique: 
+libunique:
 libunique: Unique is a library for writing single instance applications. Unique
 libunique: makes it easy to write this kind of applications, by providing a base
 libunique: class, taking care of all the IPC machinery needed to send messages
 libunique: to a running instance, and also handling the startup notification
 libunique: side.
-libunique: 
+libunique:
 libunique: Homepage: http://live.gnome.org/LibUnique
-libunique: 
-libunique: 
+libunique:
+libunique: