diff --git a/libraries/wxPython/doinst.sh b/libraries/wxPython/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/libraries/wxPython/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /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/libraries/wxPython/wxPython.SlackBuild b/libraries/wxPython/wxPython.SlackBuild
index 52fe917af8..3212932e43 100644
--- a/libraries/wxPython/wxPython.SlackBuild
+++ b/libraries/wxPython/wxPython.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wxPython
 
-# Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2007-2014 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=wxPython
 VERSION=2.8.12.1
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -112,7 +112,7 @@ cd wxPython
     UNICODE=1 \
     EP_ADD_OPTS=1 \
     EP_FULL_VER=0 \
-    NO_SCRIPTS=1 \
+    NO_SCRIPTS=0 \
     WX_CONFIG="$TMP/$PRGNAM-src-$VERSION/wx-config --no_rpath" \
     build_ext --include-dirs=$TMP/$PRGNAM-src-$VERSION/lib/wx/include/gtk2-unicode-release-2.8 \
               --library-dirs=$TMP/$PRGNAM-src-$VERSION/lib \
@@ -124,13 +124,31 @@ cd wxPython
     UNICODE=1 \
     EP_ADD_OPTS=1 \
     EP_FULL_VER=0 \
-    NO_SCRIPTS=1 \
+    NO_SCRIPTS=0 \
     WX_CONFIG="$TMP/$PRGNAM-src-$VERSION/wx-config --prefix=$PKG/usr/bin/ --no_rpath" \
     SYS_WX_CONFIG="wx-config --enable-unicode" \
     build_ext --include-dirs=$TMP/$PRGNAM-src-$VERSION/lib/wx/include/gtk2-unicode-release-2.8 \
               --library-dirs=$TMP/$PRGNAM-src-$VERSION/lib \
               --rpath=/usr/lib$LIBDIRSUFFIX \
     install --root=$PKG
+
+    mkdir -p $PKG/usr/share/{applications,pixmaps} $PKG/usr/share/icons/hicolor/{16x16,32x32}/apps
+    install -m 644 distrib/*.desktop $PKG/usr/share/applications/
+
+    install -m 644 wx/py/PyCrust_16.png $PKG/usr/share/icons/hicolor/16x16/apps/PyCrust.png
+    install -m 644 wx/py/PyCrust_32.png $PKG/usr/share/icons/hicolor/32x32/apps/PyCrust.png
+    ln -s /usr/share/icons/hicolor/32x32/apps/PyCrust.png $PKG/usr/share/pixmaps/PyCrust.png
+    install -m 644 wx/py/PySlices_16.png $PKG/usr/share/icons/hicolor/16x16/apps/PySlices.png
+    install -m 644 wx/py/PySlices_32.png $PKG/usr/share/icons/hicolor/32x32/apps/PySlices.png
+    ln -s /usr/share/icons/hicolor/32x32/apps/PySlices.png $PKG/usr/share/pixmaps/PySlices.png
+    install -m 644 wx/tools/XRCed/XRCed_16.png $PKG/usr/share/icons/hicolor/16x16/apps/XRCed.png
+    install -m 644 wx/tools/XRCed/XRCed_32.png $PKG/usr/share/icons/hicolor/32x32/apps/XRCed.png
+    ln -s /usr/share/icons/hicolor/32x32/apps/XRCed.png $PKG/usr/share/pixmaps/XRCed.png
+
+    # don't ship editra - it releases independently and the included version is outdated
+    rm $PKG/usr/bin/editra
+    rm $PKG/usr/share/applications/Editra.desktop
+    rm -rf $PKG/usr/lib$LIBDIRSUFFIX/python2.7/site-packages/wx-2.8-gtk2-unicode/wx/tools/Editra
 cd -
 
 # install wxPython includes
@@ -149,6 +167,7 @@ cd $PKG/usr/doc/$PRGNAM-$VERSION/docs
 cd -
 
 mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG