diff --git a/games/hatari/doinst.sh b/games/hatari/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/games/hatari/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/games/hatari/hatari.SlackBuild b/games/hatari/hatari.SlackBuild
index 3c401f2d2a..372304b6a4 100644
--- a/games/hatari/hatari.SlackBuild
+++ b/games/hatari/hatari.SlackBuild
@@ -5,10 +5,17 @@
 
 PRGNAM=hatari
 VERSION=${VERSION-1.4.0}
-ARCH=${ARCH-i486}
-BUILD=${BUILD-1}
+BUILD=${BUILD-2}
 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
@@ -56,6 +63,7 @@ cat gpl.txt > $PKG/usr/doc/$PRGNAM-$VERSION/gpl.txt
 
 mkdir -p $PKG/install
 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.${PKGTYPE:-tgz}