diff --git a/office/leafpad/README b/office/leafpad/README
index e5886c8ee2..6fc52dc200 100644
--- a/office/leafpad/README
+++ b/office/leafpad/README
@@ -3,5 +3,4 @@ focuses on keeping weight down to a minimum, only the most essential features
 are implemented in the editor. Leafpad is simple to use, is easily compiled, 
 requires few libraries, and starts up quickly.
 
-NOTE: leafpad has optional dependencies of libgnomeprint & libgnomeprintui,
-both of which are available on SlackBuilds.org.
+Leafpad has optional dependency on libgnomeprint & libgnomeprintui.
diff --git a/office/leafpad/doinst.sh b/office/leafpad/doinst.sh
index f39d8d4dfa..1f8ff67ded 100644
--- a/office/leafpad/doinst.sh
+++ b/office/leafpad/doinst.sh
@@ -1,3 +1,10 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-    /usr/bin/update-desktop-database -q usr/share/applications
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/office/leafpad/leafpad.SlackBuild b/office/leafpad/leafpad.SlackBuild
index 365c03896d..f1ad615ee9 100644
--- a/office/leafpad/leafpad.SlackBuild
+++ b/office/leafpad/leafpad.SlackBuild
@@ -1,12 +1,27 @@
 #!/bin/sh
-
 # Slackware build script for leafpad
 
-# Written by Grigorios Bouzakis (grbzks@gmail.com)
+# Copyright 2007-2009 Grigorios Bouzakis <grbzks@xsmail.com>
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software for any purpose
+# with or without fee is hereby granted, provided that the above copyright
+# notice and this permission notice appear in all copies.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=leafpad
-VERSION=${VERSION:-0.8.16}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-0.8.17}
+ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -16,11 +31,14 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-   SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README"
@@ -44,16 +62,18 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --enable-chooser \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs 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
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -64,4 +84,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/leafpad/leafpad.info b/office/leafpad/leafpad.info
index 99d6990fd3..0d1c73b089 100644
--- a/office/leafpad/leafpad.info
+++ b/office/leafpad/leafpad.info
@@ -1,8 +1,10 @@
 PRGNAM="leafpad"
-VERSION="0.8.16"
+VERSION="0.8.17"
 HOMEPAGE="http://tarot.freeshell.org/leafpad/"
-DOWNLOAD="http://savannah.nongnu.org/download/leafpad/leafpad-0.8.16.tar.gz"
-MD5SUM="65c17a9ed866b059856b5513f5eaae17"
+DOWNLOAD="http://savannah.nongnu.org/download/leafpad/leafpad-0.8.17.tar.gz"
+MD5SUM="d39acdf4d31de309d484511bdc9f5924"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Grigorios Bouzakis"
-EMAIL="grbzks@gmail.com"
+EMAIL="grbzks@xsmail.com"
 APPROVED="rworkman"
diff --git a/office/leafpad/slack-desc b/office/leafpad/slack-desc
index d10e41a804..837f1ed94a 100644
--- a/office/leafpad/slack-desc
+++ b/office/leafpad/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-leafpad: leafpad (A notepad clone for GTK+ 2.0)
-leafpad: 
-leafpad: Leafpad is a simple GTK+ text editor that emphasizes simplicity. 
-leafpad: As development focuses on keeping weight down to a minimum, 
-leafpad: only the most essential features are implemented in the editor. 
-leafpad: Leafpad is simple to use, it's easily compiled, requires few 
+leafpad: leafpad (a notepad clone for GTK+ 2.0)
+leafpad:
+leafpad: Leafpad is a simple GTK+ text editor that emphasizes simplicity.
+leafpad: As development focuses on keeping weight down to a minimum,
+leafpad: only the most essential features are implemented in the editor.
+leafpad: Leafpad is simple to use, it's easily compiled, requires few
 leafpad: libraries, and starts up quickly.
-leafpad: 
+leafpad:
 leafpad: Homepage: http://tarot.freeshell.org/leafpad/
-leafpad: 
-leafpad: 
+leafpad:
+leafpad: