diff --git a/libraries/aubio/README b/libraries/aubio/README
index bbd74f0114..38b8408c06 100644
--- a/libraries/aubio/README
+++ b/libraries/aubio/README
@@ -5,6 +5,5 @@ live audio. The name aubio comes from 'audio' with a typo:
 several transcription errors are likely to be found in the
 results too.
 
-aubio requires libsndfile, libsamplerate and fftw. It makes
-also use of jack-audio-connection-kit, if available. All
-of which are available from SlackBuilds.org.
\ No newline at end of file
+aubio requires libsndfile and libsamplerate. It also will use 
+jack-audio-connection-kit if available. 
diff --git a/libraries/aubio/aubio.SlackBuild b/libraries/aubio/aubio.SlackBuild
index 3e6cc2ca9f..ee03277860 100644
--- a/libraries/aubio/aubio.SlackBuild
+++ b/libraries/aubio/aubio.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=aubio
 VERSION=0.3.2
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -73,10 +85,7 @@ make install-strip DESTDIR=$PKG
 mkdir -p $PKG/usr/man/man1
 cp -f doc/*.1 $PKG/usr/man/man1/
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO VERSION \