diff --git a/libraries/locale-gettext/locale-gettext.SlackBuild b/libraries/locale-gettext/locale-gettext.SlackBuild
index 35547a1940..061b82878c 100644
--- a/libraries/locale-gettext/locale-gettext.SlackBuild
+++ b/libraries/locale-gettext/locale-gettext.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for locale-gettext perl module
 
-# Copyright 2006-2008  Robby Workman, Northport, Alabama, USA
+# Copyright 2006,2007,2008,2010  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
 
 PRGNAM=locale-gettext
 VERSION=1.05
-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
@@ -51,18 +60,14 @@ cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mv $PKG/usr/share/man $PKG/usr/man
-( 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 {} \;
+
 rm -rf $PKG/usr/share
-( cd $PKG
   # Remove 'special' files
-  find . -name perllocal.pod \
+  find $PKG -name perllocal.pod \
   -o -name "\.packlist" \
   -o -name "*.bs" \
   | xargs rm -f
-)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc