diff --git a/office/leafpad/leafpad.SlackBuild b/office/leafpad/leafpad.SlackBuild
index f1ad615ee9..27221a93d2 100644
--- a/office/leafpad/leafpad.SlackBuild
+++ b/office/leafpad/leafpad.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Slackware build script for leafpad
 
-# Copyright 2007-2009 Grigorios Bouzakis <grbzks@xsmail.com>
+# Copyright 2007-2010 Grigorios Bouzakis <grbzks@xsmail.com>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -20,11 +20,18 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=leafpad
-VERSION=${VERSION:-0.8.17}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-0.8.18.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -39,9 +46,12 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
-DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
 
 set -e
 
@@ -72,7 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/office/leafpad/leafpad.info b/office/leafpad/leafpad.info
index 0d1c73b089..8fe6d61fa6 100644
--- a/office/leafpad/leafpad.info
+++ b/office/leafpad/leafpad.info
@@ -1,10 +1,10 @@
 PRGNAM="leafpad"
-VERSION="0.8.17"
+VERSION="0.8.18.1"
 HOMEPAGE="http://tarot.freeshell.org/leafpad/"
-DOWNLOAD="http://savannah.nongnu.org/download/leafpad/leafpad-0.8.17.tar.gz"
-MD5SUM="d39acdf4d31de309d484511bdc9f5924"
+DOWNLOAD="http://savannah.nongnu.org/download/leafpad/leafpad-0.8.18.1.tar.gz"
+MD5SUM="254a72fc67505e3aa52884c729cd7b97"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Grigorios Bouzakis"
 EMAIL="grbzks@xsmail.com"
-APPROVED="rworkman"
+APPROVED="Michiel van Wessem"