diff --git a/qemu-bios-bigger-roms.patch b/qemu-bios-bigger-roms.patch
index 951b551..7416c87 100644
--- a/qemu-bios-bigger-roms.patch
+++ b/qemu-bios-bigger-roms.patch
@@ -1,7 +1,7 @@
 From c9aea972de34bad96814301988df698063ccf608 Mon Sep 17 00:00:00 2001
 From: Glauber Costa <glommer@redhat.com>
 Date: Wed, 24 Jun 2009 14:31:41 +0100
-Subject: [PATCH 1/4] compute checksum for roms bigger than a segment
+Subject: [PATCH] compute checksum for roms bigger than a segment
 
 Some option roms (e1000 provided by gpxe project as an example)
 are bigger than a segment. The current algorithm to compute the
@@ -76,5 +76,5 @@ index 6186199..fc289c0 100644
  
  
 -- 
-1.6.3.3
+1.6.2.5
 
diff --git a/qemu-fix-build-for-esd-audio.patch b/qemu-fix-build-for-esd-audio.patch
index e155cab..de62d4c 100644
--- a/qemu-fix-build-for-esd-audio.patch
+++ b/qemu-fix-build-for-esd-audio.patch
@@ -1,7 +1,7 @@
 From b37fb38b6043e319768fa92d5541fe20afb4741b Mon Sep 17 00:00:00 2001
 From: Anthony Liguori <aliguori@us.ibm.com>
 Date: Wed, 1 Jul 2009 10:07:16 -0500
-Subject: [PATCH 4/4] Fix build for ESD audio
+Subject: [PATCH] Fix build for ESD audio
 
 (cherry picked from commit c6a5a71a3a1886afad5eeb214eb6e8785f4e0319)
 
@@ -40,5 +40,5 @@ index fc40431..f5deae9 100644
  ifdef AUDIO_PT
  LDFLAGS += -pthread
 -- 
-1.6.3.3
+1.6.2.5
 
diff --git a/qemu-fix-linux-user-build-on-ppc.patch b/qemu-fix-linux-user-build-on-ppc.patch
index 013abeb..768d4bc 100644
--- a/qemu-fix-linux-user-build-on-ppc.patch
+++ b/qemu-fix-linux-user-build-on-ppc.patch
@@ -1,7 +1,7 @@
 From 978e305a8cb8533bef2c6238c88e96913f7d09d0 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc@redhat.com>
 Date: Mon, 29 Jun 2009 14:49:03 +0100
-Subject: [PATCH 2/4] Fix linux-user build on ppc
+Subject: [PATCH] Fix linux-user build on ppc
 
 kvm-87 build fails on ppc:
 
@@ -130,5 +130,5 @@ index d31cca7..3ccfdda 100644
  #define ELF_HWCAP get_elf_hwcap()
  
 -- 
-1.6.3.3
+1.6.2.5
 
diff --git a/qemu-fix-pcspk-build-with-kvm-disabled.patch b/qemu-fix-pcspk-build-with-kvm-disabled.patch
deleted file mode 100644
index 454bae9..0000000
--- a/qemu-fix-pcspk-build-with-kvm-disabled.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 85da3db92e4b25275426e252974db7eae18e2bb1 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Mon, 29 Jun 2009 16:09:45 +0100
-Subject: [PATCH] Fix pcspk build with kvm disabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Errors are:
-
-  hw/pcspk.c:85: error: expected declaration specifiers or ‘...’ before ‘kvm_pit_state’
-  hw/pcspk.c:87: error: expected declaration specifiers or ‘...’ before ‘kvm_pit_state’
-  hw/pcspk.c: In function ‘pcspk_callback’:
-  hw/pcspk.c:114: error: too many arguments to function ‘kvm_get_pit_ch2’
-  hw/pcspk.c: In function ‘pcspk_ioport_read’:
-  hw/pcspk.c:161: error: too many arguments to function ‘kvm_get_pit_ch2’
-  hw/pcspk.c: In function ‘pcspk_ioport_write’:
-  hw/pcspk.c:171: error: storage size of ‘inkernel_state’ isn’t known
-  hw/pcspk.c:175: error: too many arguments to function ‘kvm_get_pit_ch2’
-  hw/pcspk.c:185: error: too many arguments to function ‘kvm_set_pit_ch2’
-  hw/pcspk.c:171: warning: unused variable ‘inkernel_state’
-
-Signed-off-by: Mark McLoughlin <markmc@redhat.com>
-Cc: Jan Kiszka <jan.kiszka@web.de>
----
- hw/pcspk.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/hw/pcspk.c b/hw/pcspk.c
-index 9e1b59a..fb823d5 100644
---- a/hw/pcspk.c
-+++ b/hw/pcspk.c
-@@ -80,11 +80,15 @@ static void kvm_set_pit_ch2(PITState *pit,
-         kvm_set_pit(kvm_context, inkernel_state);
-     }
- }
--#else
-+#elif defined(USE_KVM)
- static inline void kvm_get_pit_ch2(PITState *pit,
-                                    kvm_pit_state *inkernel_state) { }
- static inline void kvm_set_pit_ch2(PITState *pit,
-                                    kvm_pit_state *inkernel_state) { }
-+#else
-+typedef struct kvm_pit_state { char dummy; } kvm_pit_state;
-+#define kvm_get_pit_ch2(p, s) do { (void)s; } while(0)
-+#define kvm_set_pit_ch2(p, s) do { (void)s; } while(0)
- #endif
- 
- static inline void generate_samples(PCSpkState *s)
--- 
-1.6.2.5
-
diff --git a/qemu-fix-ppc-softmmu-kvm-disabled-build.patch b/qemu-fix-ppc-softmmu-kvm-disabled-build.patch
deleted file mode 100644
index 314488f..0000000
--- a/qemu-fix-ppc-softmmu-kvm-disabled-build.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 398e45e57ee98e9d1a7387816b53d7038d1c3283 Mon Sep 17 00:00:00 2001
-From: Anthony Liguori <aliguori@us.ibm.com>
-Date: Wed, 24 Jun 2009 14:25:15 -0500
-Subject: [PATCH] Fix ppc-softmmu kvm-disabled build
-
-This gets ppc-softmmu building when KVM is not enabled.  It may be enough to get
-it working with KVM enabled but I haven't checked.
-
-(cherry picked from commit 9011bae8e2101095aae53f1f1553ca3e72919f9b)
-
-Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-Signed-off-by: Avi Kivity <avi@redhat.com>
-Signed-off-by: Mark McLoughlin <markmc@redhat.com>
----
- hw/ppc440.c            |    1 +
- hw/ppc440_bamboo.c     |    1 +
- hw/ppce500_mpc8544ds.c |    1 +
- qemu-kvm.h             |    1 +
- target-ppc/helper.c    |    1 +
- target-ppc/machine.c   |    1 +
- 6 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/hw/ppc440.c b/hw/ppc440.c
-index 00d82e4..c2c9e65 100644
---- a/hw/ppc440.c
-+++ b/hw/ppc440.c
-@@ -19,6 +19,7 @@
- #include "ppc405.h"
- #include "sysemu.h"
- #include "kvm.h"
-+#include "qemu-kvm.h"
- 
- #define PPC440EP_PCI_CONFIG     0xeec00000
- #define PPC440EP_PCI_INTACK     0xeed00000
-diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
-index 00aa2c7..e4aad39 100644
---- a/hw/ppc440_bamboo.c
-+++ b/hw/ppc440_bamboo.c
-@@ -22,6 +22,7 @@
- #include "kvm.h"
- #include "kvm_ppc.h"
- #include "device_tree.h"
-+#include "qemu-kvm.h"
- 
- #define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
- 
-diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
-index d9ed36c..1099b99 100644
---- a/hw/ppce500_mpc8544ds.c
-+++ b/hw/ppce500_mpc8544ds.c
-@@ -29,6 +29,7 @@
- #include "device_tree.h"
- #include "openpic.h"
- #include "ppce500.h"
-+#include "qemu-kvm.h"
- 
- #define BINARY_DEVICE_TREE_FILE    "mpc8544ds.dtb"
- #define UIMAGE_LOAD_BASE           0
-diff --git a/qemu-kvm.h b/qemu-kvm.h
-index 68a5b40..9341d0c 100644
---- a/qemu-kvm.h
-+++ b/qemu-kvm.h
-@@ -169,6 +169,7 @@ int kvm_has_sync_mmu(void);
- void kvm_init_vcpu(CPUState *env);
- void kvm_load_tsc(CPUState *env);
- #else
-+#define kvm_has_sync_mmu() (0)
- #define kvm_enabled() (0)
- #define kvm_nested 0
- #define qemu_kvm_irqchip_in_kernel() (0)
-diff --git a/target-ppc/helper.c b/target-ppc/helper.c
-index 5a7a935..3629c99 100644
---- a/target-ppc/helper.c
-+++ b/target-ppc/helper.c
-@@ -29,6 +29,7 @@
- #include "helper_regs.h"
- #include "qemu-common.h"
- #include "kvm.h"
-+#include "qemu-kvm.h"
- 
- //#define DEBUG_MMU
- //#define DEBUG_BATS
-diff --git a/target-ppc/machine.c b/target-ppc/machine.c
-index 99ba3eb..ec8e197 100644
---- a/target-ppc/machine.c
-+++ b/target-ppc/machine.c
-@@ -1,6 +1,7 @@
- #include "hw/hw.h"
- #include "hw/boards.h"
- #include "kvm.h"
-+#include "qemu-kvm.h"
- 
- void cpu_save(QEMUFile *f, void *opaque)
- {
--- 
-1.6.2.5
-
diff --git a/qemu-prefer-sysfs-for-usb-host-devices.patch b/qemu-prefer-sysfs-for-usb-host-devices.patch
index f1b0a0f..5fbbf2c 100644
--- a/qemu-prefer-sysfs-for-usb-host-devices.patch
+++ b/qemu-prefer-sysfs-for-usb-host-devices.patch
@@ -1,7 +1,7 @@
 From da1377c5e28ea68a6492b627725e8dd5f7acbb0a Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc@redhat.com>
 Date: Fri, 3 Jul 2009 09:17:20 +0100
-Subject: [PATCH 3/4] Prefer sysfs for USB host devices
+Subject: [PATCH] Prefer sysfs for USB host devices
 
 Scanning for devices via /sys/bus/usb/devices/ and using them via the
 /dev/bus/usb/<bus>/<device> character devices is the prefered method
@@ -58,5 +58,5 @@ index 67e4acd..3c724ba 100644
          if (!usb_fs_type) {
              monitor_printf(mon, "husb: unable to access USB devices\n");
 -- 
-1.6.3.3
+1.6.2.5
 
diff --git a/qemu-slirp-Fix-guestfwd-for-incoming-data.patch b/qemu-slirp-Fix-guestfwd-for-incoming-data.patch
index 56a86e6..95a14cf 100644
--- a/qemu-slirp-Fix-guestfwd-for-incoming-data.patch
+++ b/qemu-slirp-Fix-guestfwd-for-incoming-data.patch
@@ -1,4 +1,4 @@
-From b0dc78730e54bd3ef96f56466890aa2509a328c3 Mon Sep 17 00:00:00 2001
+From ff933dfefb22e2ef115eb6035e23b0f64335b0db Mon Sep 17 00:00:00 2001
 From: Jan Kiszka <jan.kiszka@siemens.com>
 Date: Wed, 22 Jul 2009 17:03:52 +0200
 Subject: [PATCH] slirp: Fix guestfwd for incoming data
@@ -16,10 +16,10 @@ Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
  3 files changed, 14 insertions(+), 13 deletions(-)
 
 diff --git a/net.c b/net.c
-index 90cf912..1c2c7d0 100644
+index a34f1d3..7e1edf6 100644
 --- a/net.c
 +++ b/net.c
-@@ -1150,7 +1150,7 @@ static void slirp_smb(SlirpState* s, Monitor *mon, const char *exported_dir,
+@@ -1170,7 +1170,7 @@ static void slirp_smb(SlirpState* s, Monitor *mon, const char *exported_dir,
      snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s",
               SMBD_COMMAND, smb_conf);
  
@@ -28,7 +28,7 @@ index 90cf912..1c2c7d0 100644
          slirp_smb_cleanup(s);
          config_error(mon, "conflicting/invalid smbserver address\n");
      }
-@@ -1239,16 +1239,17 @@ static void slirp_guestfwd(SlirpState *s, Monitor *mon, const char *config_str,
+@@ -1259,16 +1259,17 @@ static void slirp_guestfwd(SlirpState *s, Monitor *mon, const char *config_str,
          qemu_free(fwd);
          return;
      }
@@ -95,5 +95,5 @@ index 0ce62a3..9be8553 100644
  }
  
 -- 
-1.6.2.2
+1.6.2.5