diff --git a/srcpkgs/qemu/patches/musl-ifunc.patch b/srcpkgs/qemu/patches/musl-ifunc.patch
new file mode 100644
index 0000000000..79fbe994b5
--- /dev/null
+++ b/srcpkgs/qemu/patches/musl-ifunc.patch
@@ -0,0 +1,11 @@
+--- util/cutils.c.orig	2016-05-12 17:19:06.890739262 +0200
++++ util/cutils.c	2016-05-12 17:19:21.481711477 +0200
+@@ -262,7 +262,7 @@ static size_t buffer_find_nonzero_offset
+  * restrict the gcc version to 4.9+ to prevent the failure.
+  */
+ 
+-#if defined CONFIG_AVX2_OPT && QEMU_GNUC_PREREQ(4, 9)
++#if defined(__GLIBC__) && defined CONFIG_AVX2_OPT && QEMU_GNUC_PREREQ(4, 9)
+ #pragma GCC push_options
+ #pragma GCC target("avx2")
+ #include <cpuid.h>
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 2b5c1185c0..aad57ef59b 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,13 +1,13 @@
 # Template file for 'qemu'
 pkgname=qemu
-version=2.5.1.1
+version=2.6.0
 revision=1
 short_desc="Open Source Processor Emulator"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://qemu.org"
 license="GPL-2, LGPL-2.1"
 distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=28d9946e43765a44ccccca3cba5f4f9034f2759ec1f2ce16594ddb6776c8efe6
+checksum=c9ac4a651b273233d21b8bec32e30507cb9cce7900841febc330956a1a8434ec
 
 nostrip=yes
 hostmakedepends="pkg-config perl python automake libtool flex"
@@ -20,7 +20,7 @@ makedepends="libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel
  $(vopt_if spice spice-devel)"
 
 build_options="gtk sdl sdl2 spice"
-build_options_default="sdl"
+build_options_default="sdl2"
 desc_option_gtk="Enable GTK display and use it by default"
 desc_option_sdl="Use SDL (1.x) video output"
 desc_option_sdl2="Use SDL (2.x) video output"
@@ -36,9 +36,6 @@ do_configure() {
 
 	sed -e 's,-rpath /usr/local/lib,,g' -i configure
 
-	# XXX remove this when kernel headers are updated to 3.16.
-	export CFLAGS+=" -D_LINUX_XATTR_H"
-
 	if [ "$CROSS_BUILD" ]; then
 		args+=" --cross-prefix=${XBPS_CROSS_TRIPLET}-"
 		export LIBTOOL=libtool