diff --git a/libraries/dietlibc/dietlibc.SlackBuild b/libraries/dietlibc/dietlibc.SlackBuild
index e9de8dbc1d..cef499b3ee 100644
--- a/libraries/dietlibc/dietlibc.SlackBuild
+++ b/libraries/dietlibc/dietlibc.SlackBuild
@@ -25,10 +25,19 @@
  
 PRGNAM=dietlibc
 VERSION=${VERSION:-0.32}
-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) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -70,10 +79,7 @@ chmod 0755 $PKG/etc/profile.d/*
 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/opt/diet/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/opt/diet/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \