diff --git a/games/yamagi-quake2/README b/games/yamagi-quake2/README
index 2edb6f96ca..762271793b 100644
--- a/games/yamagi-quake2/README
+++ b/games/yamagi-quake2/README
@@ -1,7 +1,11 @@
-This is an enhanced client for Id Software's legendary Quake II. It focuses
-on single-player. Features include rock-solid stability and AMD64 support.
+This is an enhanced client for Id Software's legendary Quake II.
+It focuses on single-player. Features include rock-solid stability
+and AMD64 support.
 
-This only installs the Yamagi-Quake2 source port. Before playing it, you
-need to copy your Quake2 data files into the appropriate subdirectories of
-/usr/share/quake2.  Please refer to the README files in
-/usr/doc/yamagi-quake2-4.00/ for details.
+This only installs the Yamagi-Quake2 source port. Before playing
+it, you need to copy your Quake2 data files into the appropriate
+subdirectories of /usr/share/quake2.  Please refer to the README
+files in /usr/doc/yamagi-quake2-4.02/ for details.
+
+To get a reasonable default configuration, copy
+/usr/doc/yamagi-quake2/4.02/yq2.cfg to your baseq2 directory.
diff --git a/games/yamagi-quake2/doinst.sh b/games/yamagi-quake2/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/yamagi-quake2/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/yamagi-quake2/quake2.desktop b/games/yamagi-quake2/quake2.desktop
new file mode 100644
index 0000000000..f8dd179c7b
--- /dev/null
+++ b/games/yamagi-quake2/quake2.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Quake 2
+GenericName=Quake 2
+Exec=quake2
+Icon=Quake2
+Type=Application
+Categories=Game;
diff --git a/games/yamagi-quake2/yamagi-quake2.SlackBuild b/games/yamagi-quake2/yamagi-quake2.SlackBuild
index 969c7ad4c8..6eb8ff9b29 100644
--- a/games/yamagi-quake2/yamagi-quake2.SlackBuild
+++ b/games/yamagi-quake2/yamagi-quake2.SlackBuild
@@ -2,18 +2,18 @@
 
 # Slackware build script for Yamagi Quake2
 
-# Written by Dugan Chen (dugan [underscore] c [at] fastmail dot] fm)
+# Written by Dugan Chen (thedoogster@gmail.com)
 
 # Includes components from the Arch Linux AUR builds.
 
 PRGNAM=yamagi-quake2
-VERSION=${VERSION:-4.01}
+VERSION=${VERSION:-4.02}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CTFVER=${CTFVER:-1.00}
-XATRIXVER=${XATRIXVER:-1.06}
-ROGUEVER=${ROGUEVER:-1.04}
+XATRIXVER=${XATRIXVER:-1.07}
+ROGUEVER=${ROGUEVER:-1.05}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -66,7 +66,13 @@ CXXFLAGS="$SLKCFLAGS" \
 
 mkdir -p $PKG/usr/{bin,share/quake2/{ctf,xatrix,rogue}}
 cp -r release/* $PKG/usr/share/quake2
+mkdir -p $PKG/usr/share/quake2/baseq2
+cp stuff/yq2.cfg $PKG/usr/share/quake2/baseq2
+mkdir -p $PKG/usr/share/pixmaps
+cp icon/Quake2.png $PKG/usr/share/pixmaps
 install -D -m 755 $CWD/quake2.sh $PKG/usr/bin/quake2
+mkdir -p $PKG/usr/share/applications
+cat $CWD/quake2.desktop > $PKG/usr/share/applications/quake2.desktop
 
 # CTF Support
 
@@ -90,7 +96,7 @@ install -D -m 755 $CWD/ctf.sh $PKG/usr/bin/ctf
 # Mission Pack 1 support
 
 cd $TMP
-tar xvf $CWD/quake2-xatrix-$XATRIXVER.tar.bz2
+tar xvf $CWD/quake2-xatrix-$XATRIXVER.tar.xz
 cd quake2-xatrix-$XATRIXVER
 
 chown -R root:root .
@@ -109,7 +115,7 @@ install -D -m 755 $CWD/xatrix.sh $PKG/usr/bin/xatrix
 # Mission Pack 2 support
 
 cd $TMP
-tar xvf $CWD/quake2-rogue-$ROGUEVER.tar.bz2
+tar xvf $CWD/quake2-rogue-$ROGUEVER.tar.xz
 cd quake2-rogue-$ROGUEVER
 
 chown -R root:root .
@@ -153,6 +159,7 @@ cp -a \
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/games/yamagi-quake2/yamagi-quake2.info b/games/yamagi-quake2/yamagi-quake2.info
index 2deffb4085..ea5a82013b 100644
--- a/games/yamagi-quake2/yamagi-quake2.info
+++ b/games/yamagi-quake2/yamagi-quake2.info
@@ -1,16 +1,16 @@
 PRGNAM="yamagi-quake2"
-VERSION="4.01"
+VERSION="4.02"
 HOMEPAGE="http://www.yamagi.org/quake2/"
-DOWNLOAD="http://deponie.yamagi.org/quake2/quake2-4.01.tar.xz \
-    http://deponie.yamagi.org/quake2/quake2-ctf-1.00.tar.xz \
-	http://deponie.yamagi.org/quake2/quake2-xatrix-1.06.tar.bz2 \
-    http://deponie.yamagi.org/quake2/quake2-rogue-1.04.tar.bz2"
-MD5SUM="c73f6a19afd6b262dd89cb5c6524569b \
-	d6d50b456f482dda92d6e4a615ef13bd \
-    c69e60937e1550fc424e26b1dfb2c55f \
-    be83f102dc3b2a10edd4153ac02dc8c7"
+DOWNLOAD="http://deponie.yamagi.org/quake2/quake2-4.02.tar.xz \
+          http://deponie.yamagi.org/quake2/quake2-ctf-1.00.tar.xz \
+          http://deponie.yamagi.org/quake2/quake2-xatrix-1.07.tar.xz \
+          http://deponie.yamagi.org/quake2/quake2-rogue-1.05.tar.xz"
+MD5SUM="831cbe432b740f4225ce3a02bc665845 \
+        d6d50b456f482dda92d6e4a615ef13bd \
+        e650aea5c7b6f9ae8d99b6ed3914549b \
+        4efde0c4bfcaffdfb069418baf3e2597"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Dugan Chen"
 EMAIL="thedoogster@gmail.com"
-APPROVED="Niels Horn,Erik Hanson"
+APPROVED="rworkman"