diff --git a/academic/gaw3/doinst.sh b/academic/gaw3/doinst.sh
index 9a8ded3c60..65c7e2eeb9 100644
--- a/academic/gaw3/doinst.sh
+++ b/academic/gaw3/doinst.sh
@@ -2,6 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /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
+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 -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
 fi
diff --git a/academic/gaw3/gaw3.SlackBuild b/academic/gaw3/gaw3.SlackBuild
index b092a383ca..da653ea459 100644
--- a/academic/gaw3/gaw3.SlackBuild
+++ b/academic/gaw3/gaw3.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gaw3
-VERSION=${VERSION:-20150228}
+VERSION=${VERSION:-20170326}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -80,7 +80,6 @@ make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
 cp $CWD/$PRGNAM.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
-chmod -x $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
 
 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
@@ -94,18 +93,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 mkdir -p $PKG/usr/share/applications
-cat <<EOF > $PKG/usr/share/applications/$PRGNAM.desktop
-[Desktop Entry]
-Encoding=UTF-8
-Name=Gaw3
-Comment=Analog Waveform Viewer
-Exec=gaw
-Terminal=false
-Type=Application
-Categories=Science
-Icon=gaw3
-StartupNotify=false
-EOF
+cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
 
 rm $PKG/usr/share/applications/gaw.desktop
 rm -r $PKG/usr/share/pixmaps
diff --git a/academic/gaw3/gaw3.desktop b/academic/gaw3/gaw3.desktop
new file mode 100644
index 0000000000..b49634b4f6
--- /dev/null
+++ b/academic/gaw3/gaw3.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Gaw3
+Comment=Analog Waveform Viewer
+Exec=gaw
+Terminal=false
+Type=Application
+Categories=Education
+Icon=gaw3
+StartupNotify=false
diff --git a/academic/gaw3/gaw3.info b/academic/gaw3/gaw3.info
index d46c8ab135..f939dc20e9 100644
--- a/academic/gaw3/gaw3.info
+++ b/academic/gaw3/gaw3.info
@@ -1,8 +1,8 @@
 PRGNAM="gaw3"
-VERSION="20150228"
+VERSION="20170326"
 HOMEPAGE="http://www.rvq.fr/linux/gaw.php"
-DOWNLOAD="http://download.tuxfamily.org/gaw/download/gaw3-20150228.tar.gz"
-MD5SUM="514e2ea394f85a1bac7e67415729f839"
+DOWNLOAD="http://download.tuxfamily.org/gaw/download/gaw3-20170326.tar.gz"
+MD5SUM="b4f14fed0be366cfb0b17c3542702eb7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""