diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 8df04fb92e6..dbcbd3d0005 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.116 2014/04/25 20:59:43 brad Exp $
+# $OpenBSD: Makefile,v 1.117 2014/08/14 01:05:03 brad Exp $
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc sparc64
 
 COMMENT=	multi system emulator
 
 DISTNAME=	qemu-2.0.0
+REVISION=	0
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -65,6 +66,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-bsd-user \
 		--disable-libiscsi \
 		--disable-libusb \
+		--disable-lzo \
 		--disable-smartcard-nss \
 		--disable-spice \
 		--disable-uuid \
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 0867371c8ef..f0c1d276b6b 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qemu-2.0.0.tar.bz2) = YMwaoMrTnOyJH5cL7WDKikhPBxra1JQxI1mawiNUOjs=
-SIZE (qemu-2.0.0.tar.bz2) = 12839647
+SHA256 (qemu-2.1.0-rc2.tar.bz2) = 0pcp55jzEcJPHmtRPMqquDFirkuRmEnCiYpFhO/C+vE=
+SIZE (qemu-2.1.0-rc2.tar.bz2) = 23551394
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
index ec1d11afa34..094daa199b9 100644
--- a/emulators/qemu/patches/patch-configure
+++ b/emulators/qemu/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.41 2014/04/25 20:59:43 brad Exp $
---- configure.orig	Mon Apr 14 19:31:26 2014
-+++ configure	Mon Apr 14 20:47:16 2014
-@@ -3910,8 +3910,6 @@ fi
+$OpenBSD: patch-configure,v 1.42 2014/08/14 01:05:03 brad Exp $
+--- configure.orig	Tue Jul 15 17:49:14 2014
++++ configure	Wed Jul 16 14:19:59 2014
+@@ -3990,8 +3990,6 @@ fi
  if test "$gcov" = "yes" ; then
    CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
    LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
diff --git a/emulators/qemu/patches/patch-tcg_ppc_tcg-target_c b/emulators/qemu/patches/patch-tcg_ppc_tcg-target_c
new file mode 100644
index 00000000000..976770789fb
--- /dev/null
+++ b/emulators/qemu/patches/patch-tcg_ppc_tcg-target_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-tcg_ppc_tcg-target_c,v 1.1 2014/08/14 01:05:03 brad Exp $
+--- tcg/ppc/tcg-target.c.orig	Fri Jul  4 18:29:45 2014
++++ tcg/ppc/tcg-target.c	Fri Jul  4 18:32:59 2014
+@@ -2717,4 +2717,11 @@ static void __attribute__((constructor)) tcg_cache_ini
+     dcache_bsize = cacheline;
+     icache_bsize = cacheline;
+ }
++
++#elif defined(__OpenBSD__)
++static void __attribute__((constructor)) tcg_cache_init(void)
++{
++    dcache_bsize = 32;
++    icache_bsize = 32;
++}
+ #endif
diff --git a/emulators/qemu/patches/patch-util_cache-utils_c b/emulators/qemu/patches/patch-util_cache-utils_c
deleted file mode 100644
index 5b28bfbd293..00000000000
--- a/emulators/qemu/patches/patch-util_cache-utils_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-util_cache-utils_c,v 1.2 2014/04/25 20:59:43 brad Exp $
---- util/cache-utils.c.orig	Thu Mar 13 23:10:11 2014
-+++ util/cache-utils.c	Sun Mar 16 09:06:40 2014
-@@ -81,6 +81,12 @@ void qemu_cache_utils_init(void)
-     qemu_cache_conf.dcache_bsize = cacheline;
-     qemu_cache_conf.icache_bsize = cacheline;
- }
-+#elif defined(__OpenBSD__)
-+void qemu_cache_utils_init(void)
-+{
-+    qemu_cache_conf.dcache_bsize = 32;
-+    qemu_cache_conf.icache_bsize = 32;
-+}
- #endif
- 
- #endif /* _ARCH_PPC */
diff --git a/emulators/qemu/pkg/PLIST b/emulators/qemu/pkg/PLIST
index 3d0af42bae2..9ec81d6152d 100644
--- a/emulators/qemu/pkg/PLIST
+++ b/emulators/qemu/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.29 2014/04/25 20:59:43 brad Exp $
+@comment $OpenBSD: PLIST,v 1.30 2014/08/14 01:05:03 brad Exp $
 @conflict kqemu-*
 @conflict qemu-*
 @pkgpath emulators/kqemu
@@ -139,6 +139,7 @@ share/qemu/s390-zipl.rom
 share/qemu/sgabios.bin
 share/qemu/slof.bin
 share/qemu/spapr-rtas.bin
+share/qemu/u-boot.e500
 share/qemu/vgabios-cirrus.bin
 share/qemu/vgabios-qxl.bin
 share/qemu/vgabios-stdvga.bin