diff --git a/development/bluefish/bluefish.SlackBuild b/development/bluefish/bluefish.SlackBuild
index 4ab198b6b8..a8e0c57ccb 100644
--- a/development/bluefish/bluefish.SlackBuild
+++ b/development/bluefish/bluefish.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bluefish
 
-# Copyright 2006-2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2006,2007,2008,2009,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=bluefish
 VERSION=2.0.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
@@ -77,10 +86,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 \
diff --git a/development/bluefish/slack-desc b/development/bluefish/slack-desc
index d48ea7f32e..1a934e4940 100644
--- a/development/bluefish/slack-desc
+++ b/development/bluefish/slack-desc
@@ -14,6 +14,6 @@ bluefish: languages, but it focuses on editing dynamic and interactive
 bluefish: websites. See features for an extensive overview, take a look 
 bluefish: at the screenshots, or download it right away. Bluefish is an 
 bluefish: open source development project, released under the GPL licence.
-bluefish: 
+bluefish:
 bluefish: Homepage: http://bluefish.openoffice.nl/index.html
-bluefish: 
+bluefish: