diff --git a/audio/deadbeef/README b/audio/deadbeef/README
index b8a929b045..bb08fa2fa9 100644
--- a/audio/deadbeef/README
+++ b/audio/deadbeef/README
@@ -21,6 +21,5 @@ Main features:
 * was tested and works on x86, x86_64 and ppc64 architectures. should work
   on most modern platforms.
 
-This requires libsamplerate, and all of the following are optional:
 amrnb, amrwb, dirac, faac, faad2, ffmpeg, lame, libsndfile, openjpeg, 
-schroedinger, speex, x264, xvidcore
+schroedinger, speex, x264, and xvidcore are optional dependencies.
diff --git a/audio/deadbeef/deadbeef.SlackBuild b/audio/deadbeef/deadbeef.SlackBuild
index 00ae4cc1a6..8d8c5c36a7 100644
--- a/audio/deadbeef/deadbeef.SlackBuild
+++ b/audio/deadbeef/deadbeef.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=deadbeef
 VERSION=0.3.3
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-2}
 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
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e