diff --git a/multimedia/picard/README b/multimedia/picard/README
index d419ab0790..264ef9beb2 100644
--- a/multimedia/picard/README
+++ b/multimedia/picard/README
@@ -4,7 +4,4 @@ the ClassicTagger was. Picard is written in Python, which is a cross-platform
 language, and makes use of cross-platform libraries - this allows the same 
 code to run both on Windows, Linux and Mac OS X.
 
-Requires mutagen and optionally but recommended fftw and libofa
-used for fingerprinting the songs for automagic tagging
-
-All packages available on SlackBuilds.org
+This requires mutagen, and libofa is optional but recommended.
diff --git a/multimedia/picard/picard.SlackBuild b/multimedia/picard/picard.SlackBuild
index 3842e91c32..f608e8b3cb 100644
--- a/multimedia/picard/picard.SlackBuild
+++ b/multimedia/picard/picard.SlackBuild
@@ -5,10 +5,19 @@
 
 PRGNAM=picard
 VERSION=0.11
-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
@@ -23,6 +32,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -57,4 +69,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/multimedia/picard/slack-desc b/multimedia/picard/slack-desc
index b092071a63..9fa4b9400c 100644
--- a/multimedia/picard/slack-desc
+++ b/multimedia/picard/slack-desc
@@ -16,5 +16,4 @@ picard: libraries - this allows the same code to run both on Windows, Linux
 picard: and Mac OS X.
 picard: 
 picard: Homepage: http://musicbrainz.org/doc/Picard_Tagger
-picard: 
-
+picard: