diff --git a/desktop/slock/slock.SlackBuild b/desktop/slock/slock.SlackBuild
index 92d0e687d3..c15cc90a62 100644
--- a/desktop/slock/slock.SlackBuild
+++ b/desktop/slock/slock.SlackBuild
@@ -7,10 +7,19 @@
 
 PRGNAM=slock
 VERSION=${VERSION:-0.9}
-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
@@ -25,6 +34,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/desktop/slock/slock.info b/desktop/slock/slock.info
index f7b28d5c4a..cfdb55aeae 100644
--- a/desktop/slock/slock.info
+++ b/desktop/slock/slock.info
@@ -1,7 +1,7 @@
 PRGNAM="slock"
 VERSION="0.9"
 HOMEPAGE="http://tools.suckless.org/slock"
-DOWNLOAD="http://code.suckless.org/dl/tools/slock-0.9.tar.gz"
+DOWNLOAD="http://dl.suckless.org/tools/slock-0.9.tar.gz"
 MD5SUM="df342ad129cf2c3b8eb8da9d9d0ab845"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""