diff --git a/system/qemu/README b/system/qemu/README
index 6b44670759..32d9ebc6e6 100644
--- a/system/qemu/README
+++ b/system/qemu/README
@@ -9,3 +9,7 @@ executing the guest code directly on the host CPU. A host driver called
 the QEMU accelerator (also known as KQEMU) is needed in this case. The 
 virtualizer mode requires that both the host and guest machine use x86 
 compatible processors.
+
+NOTE:
+qemu builds man-pages at compile-time; to do so, /sbin must be in the
+current $PATH.  Be sure to run the script as root ( "su -" ).
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index 0306143947..e1d60c643d 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for qemu
 
-# Copyright 2009  Andrew Brouwers <abrouwers@gmail.com>
+# Copyright 2009,2010  Andrew Brouwers <abrouwers@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,14 +25,14 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=qemu
-VERSION=0.10.5
+VERSION=0.12.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-/tmp/SBo/package-$PRGNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
@@ -63,29 +63,33 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --enable-system \
-  --audio-drv-list=oss,alsa,sdl,esd
+  --audio-drv-list=alsa,oss,sdl,esd
 
-make
+make OS_CFLAGS="$SLKCFLAGS"
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mv $PKG/usr/share/man $PKG/usr/
-( 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
-)
+# move any generated man pages to their proper location
+if [ -d $PKG/usr/share/man ]; then
+  mv $PKG/usr/share/man $PKG/usr
+  gzip -9 $PKG/usr/man/man?/*.?
+fi
 
+# Add docs, and if present, built documentation to the proper location
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp TODO README LICENSE COPYING COPYING.LIB MAINTAINERS \
+cp -a TODO README LICENSE COPYING COPYING.LIB MAINTAINERS \
   $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/qemu/* $PKG/usr/doc/$PRGNAM-$VERSION/
-rm -rf $PKG/usr/share/doc
+if [ -d $PKG/usr/share/doc ]; then
+  mv $PKG/usr/share/doc/qemu/* $PKG/usr/doc/$PRGNAM-$VERSION/
+  rm -rf $PKG/usr/share/doc
+fi
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index f1710f0173..dd0b533225 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,10 @@
 PRGNAM="qemu"
-VERSION="0.10.5"
+VERSION="0.12.1"
 HOMEPAGE="http://www.nongnu.org/qemu/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/qemu/qemu-0.10.5.tar.gz"
-MD5SUM="60060feb98c9649a5da8b136685f76ba"
+DOWNLOAD="http://download.savannah.gnu.org/releases/qemu/qemu-0.12.1.tar.gz"
+MD5SUM="df9a979ac72251036b7d0794895233a5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Andrew Brouwers"
 EMAIL="abrouwers@gmail.com"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"