diff --git a/system/emelfm2/doinst.sh b/system/emelfm2/doinst.sh
index 1be07cc6d6..9830478e8c 100644
--- a/system/emelfm2/doinst.sh
+++ b/system/emelfm2/doinst.sh
@@ -1,8 +1,14 @@
-
 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 [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/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/system/emelfm2/emelfm2.SlackBuild b/system/emelfm2/emelfm2.SlackBuild
index 8432c0304c..6b91428771 100644
--- a/system/emelfm2/emelfm2.SlackBuild
+++ b/system/emelfm2/emelfm2.SlackBuild
@@ -1,10 +1,29 @@
 #!/bin/sh
 
 # Slackware build script for emelFM2
-# Written by Chess Griffin <chess at chessgriffin dot com>
+
+# Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS 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 AUTHOR 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=emelfm2
-VERSION=0.5.0
+VERSION=0.6.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -16,18 +35,23 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-0.5 || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -35,30 +59,51 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-make DOCS_VERSION=1 PREFIX=/usr || exit 1
-make install DOCS_VERSION=1 USE_LATEST=1 USE_GAMIN=1 PREFIX=$PKG/usr || exit 1
+make \
+  PREFIX=/usr \
+  USE_LATEST=1 \
+  USE_GAMIN=1 \
+  WITH_HAL=1 \
+  DOCS_VERSION=1 \
+  DOC_DIR=/usr/doc/$PRGNAM-$VERSION
+make install \
+  PREFIX=$PKG/usr \
+  USE_LATEST=1 \
+  USE_GAMIN=1 \
+  WITH_HAL=1 \
+  DOCS_VERSION=1 \
+  MAN_DIR=$PKG/usr/man/man1 \
+  DOC_DIR=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Make sure a menu entry icon is displayed
+for i in 24 32 48 ; do
+  mkdir -p $PKG/usr/share/icons/hicolor/${i}x${i}/apps
+  ( cd $PKG/usr/share/icons/hicolor/${i}x${i}/apps
+    ln -s ../../../../pixmaps/emelfm2/emelfm2_${i}.png emelfm2.png
+  )
+done
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  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
 )
 
-mkdir -p $PKG/usr/man/man1
-mv $PKG/usr/share/man/man1/* $PKG/usr/man/man1/
-rm -rf $PKG/usr/share/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
 )
 
-mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/doc $PKG/usr
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+if [ "$ARCH" = "x86_64" ]; then
+    mv $PKG/usr/lib $PKG/usr/lib64
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/system/emelfm2/emelfm2.info b/system/emelfm2/emelfm2.info
index 648c6b7071..1003784282 100644
--- a/system/emelfm2/emelfm2.info
+++ b/system/emelfm2/emelfm2.info
@@ -1,8 +1,8 @@
 PRGNAM="emelfm2"
-VERSION="0.5.0"
+VERSION="0.6.0"
 HOMEPAGE="http://www.emelfm2.net"
-DOWNLOAD="http://emelfm2.net/rel/emelfm2-0.5.0.tar.bz2"
-MD5SUM="26ce3efa9739c601bee082f642c66ac1"
+DOWNLOAD="http://emelfm2.net/rel/emelfm2-0.6.0.tar.bz2"
+MD5SUM="c153749aea954f342b28a470866ac4b0"
 MAINTAINER="Chess Griffin"
 EMAIL="chess@chessgriffin.com"
 APPROVED="dsomero"