diff --git a/desktop/xfce4-dict/slack-desc b/desktop/xfce4-dict/slack-desc
index 4756f48b75..af5353ad80 100644
--- a/desktop/xfce4-dict/slack-desc
+++ b/desktop/xfce4-dict/slack-desc
@@ -7,7 +7,7 @@
 
           |-----handy-ruler---------------------------------------------------|
 xfce4-dict: xfce4-dict (Dictionary plugin for Xfce panel)
-xfce4-dict: 
+xfce4-dict:
 xfce4-dict: With xfce4-dict, you can query a dictionary server (see RFC 2229) 
 xfce4-dict: to search for the translation or explanation of a word. You can
 xfce4-dict: also choose a dictionary offered by the server to improve your
@@ -16,3 +16,4 @@ xfce4-dict:
 xfce4-dict:
 xfce4-dict:
 xfce4-dict:
+xfce4-dict:
diff --git a/desktop/xfce4-dict/xfce4-dict.SlackBuild b/desktop/xfce4-dict/xfce4-dict.SlackBuild
index f30f468c38..6f8503be2f 100644
--- a/desktop/xfce4-dict/xfce4-dict.SlackBuild
+++ b/desktop/xfce4-dict/xfce4-dict.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=xfce4-dict
 VERSION=0.6.0
-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
@@ -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
@@ -77,10 +89,7 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man || exit 1
-  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 \