diff --git a/qemu-0.9.0-usbheaders.patch b/qemu-0.9.0-usbheaders.patch
deleted file mode 100644
index f352d61a..00000000
--- a/qemu-0.9.0-usbheaders.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- usb-linux.c	2007/02/15 13:02:17	1.21
-+++ usb-linux.c	2007/02/19 13:42:38
-@@ -26,6 +26,7 @@
- #if defined(__linux__)
- #include <dirent.h>
- #include <sys/ioctl.h>
-+#include <linux/compiler.h>
- #include <linux/usbdevice_fs.h>
- #include <linux/version.h>
- 
diff --git a/qemu.changes b/qemu.changes
index 7ced42fc..663d7cc8 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  6 22:35:06 CEST 2007 - olh@suse.de
+
+- remove inclusion of linux/compiler.h
+
 -------------------------------------------------------------------
 Mon Jul 30 18:04:08 CEST 2007 - uli@suse.de
 
diff --git a/qemu.spec b/qemu.spec
index 8b5989cc..ea6aa0d5 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -17,7 +17,7 @@ License:        BSD 3-Clause, GPL v2 or later
 Group:          System/Emulators/PC
 Summary:        Universal CPU emulator
 Version:        0.9.0.cvs
-Release:        9
+Release:        13
 Source:         %name-%version.tar.bz2
 #Patch400: qemu-0.7.0-gcc4-dot-syms.patch
 #Patch401: qemu-0.8.0-gcc4-hacks.patch
@@ -30,7 +30,6 @@ Patch10:        linkerscripts.patch
 Patch14:        qemu-0.7.1-jobsignals.patch
 Patch16:        qemu-0.7.1-armfpaex.patch
 Patch19:        qemu-0.9.0-nousbdevfs.patch
-Patch20:        qemu-0.9.0-usbheaders.patch
 Patch34:        qemu-0.9.0-migration.patch
 Patch37:        qemu-0.9.0-kvm.patch
 Patch38:        qemu-0.9.0-kvm-bios.patch
@@ -131,7 +130,6 @@ Authors:
 %patch14
 %patch16
 %patch19
-%patch20
 #%patch34 -p1
 #%patch37 -p1
 #%patch38 -p1
@@ -163,8 +161,6 @@ Authors:
 #this is the dyngen for gcc4 patch (does not work on x86)
 %patch68 -p1
 %endif
-cp -p %SOURCE200 pc-bios/
-cp -p %SOURCE202 .
 cd gcc-3.3.5
 %patch600
 %patch601
@@ -201,6 +197,8 @@ cd gcc-3.3.5
 cd ..
 
 %build
+cp -p %SOURCE200 pc-bios/
+cp -p %SOURCE202 .
 %ifarch ia64 ppc64
 %define qemucc gcc
 %else
@@ -311,6 +309,8 @@ rm -rf %{gcc33tmp}
 %endif
 
 %changelog
+* Mon Aug 06 2007 - olh@suse.de
+- remove inclusion of linux/compiler.h
 * Mon Jul 30 2007 - uli@suse.de
 - fixed for S/390
 * Tue Jul 10 2007 - schwab@suse.de