diff --git a/0001-XXX-dont-dump-core-on-sigabort.patch b/0001-XXX-dont-dump-core-on-sigabort.patch
index 0bf3cf62..dd3197db 100644
--- a/0001-XXX-dont-dump-core-on-sigabort.patch
+++ b/0001-XXX-dont-dump-core-on-sigabort.patch
@@ -1,4 +1,4 @@
-From be4605af1cc149c22317a62feb493fb34c3f248e Mon Sep 17 00:00:00 2001
+From 4e67113cd1c7eebeab06a62d97d39e6e77b59466 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 21 Nov 2011 23:50:36 +0100
 Subject: [PATCH] XXX dont dump core on sigabort
diff --git a/0002-XXX-work-around-SA_RESTART-race-wit.patch b/0002-XXX-work-around-SA_RESTART-race-wit.patch
index 4596fc37..44053594 100644
--- a/0002-XXX-work-around-SA_RESTART-race-wit.patch
+++ b/0002-XXX-work-around-SA_RESTART-race-wit.patch
@@ -1,4 +1,4 @@
-From 616b69913932a60de959232322d4bbf23ffc9094 Mon Sep 17 00:00:00 2001
+From e0496d8b8acb22e509d5d6bb6333689a5db615f6 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 1 Dec 2011 19:00:01 +0100
 Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)
diff --git a/0003-qemu-0.9.0.cvs-binfmt.patch b/0003-qemu-0.9.0.cvs-binfmt.patch
index b4c32a91..56501d22 100644
--- a/0003-qemu-0.9.0.cvs-binfmt.patch
+++ b/0003-qemu-0.9.0.cvs-binfmt.patch
@@ -1,4 +1,4 @@
-From aaebf583a487a68252c71f5ea647c93808df328d Mon Sep 17 00:00:00 2001
+From 29c2408bf7093a2d26485a08679cb14de49caf43 Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:18:44 +0200
 Subject: [PATCH] qemu-0.9.0.cvs-binfmt
diff --git a/0004-qemu-cvs-alsa_bitfield.patch b/0004-qemu-cvs-alsa_bitfield.patch
index c3c0f477..ee93c6e9 100644
--- a/0004-qemu-cvs-alsa_bitfield.patch
+++ b/0004-qemu-cvs-alsa_bitfield.patch
@@ -1,4 +1,4 @@
-From ff88b0f7809b9db23e43251e6363738e67f65899 Mon Sep 17 00:00:00 2001
+From 4fdcc1847221f05ba1721c84dbfe57f27fbc7cf6 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:20:50 +0200
 Subject: [PATCH] qemu-cvs-alsa_bitfield
diff --git a/0005-qemu-cvs-alsa_ioctl.patch b/0005-qemu-cvs-alsa_ioctl.patch
index d6a6d094..1d026f3d 100644
--- a/0005-qemu-cvs-alsa_ioctl.patch
+++ b/0005-qemu-cvs-alsa_ioctl.patch
@@ -1,4 +1,4 @@
-From 605e1f2edc230f9c5cd335e100776c28df5d6bc3 Mon Sep 17 00:00:00 2001
+From 4c491a5962c8b54f89e61930e00293901d826679 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:23:27 +0200
 Subject: [PATCH] qemu-cvs-alsa_ioctl
diff --git a/0006-qemu-cvs-alsa_mmap.patch b/0006-qemu-cvs-alsa_mmap.patch
index 0b86cb95..211bce12 100644
--- a/0006-qemu-cvs-alsa_mmap.patch
+++ b/0006-qemu-cvs-alsa_mmap.patch
@@ -1,4 +1,4 @@
-From 171e8e92539940d1b4fe6f2f56b4729730568615 Mon Sep 17 00:00:00 2001
+From cf0fce63b16eb24410ad11d10222350e3e47d2ef Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:24:15 +0200
 Subject: [PATCH] qemu-cvs-alsa_mmap
diff --git a/0007-qemu-cvs-gettimeofday.patch b/0007-qemu-cvs-gettimeofday.patch
index 33d4c554..c005aa15 100644
--- a/0007-qemu-cvs-gettimeofday.patch
+++ b/0007-qemu-cvs-gettimeofday.patch
@@ -1,4 +1,4 @@
-From 48f0170f45782906be9e468ce473455078acefed Mon Sep 17 00:00:00 2001
+From 04c1d47c2233cb3f49b27a51f5ad5c428f536faf Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:25:41 +0200
 Subject: [PATCH] qemu-cvs-gettimeofday
diff --git a/0008-qemu-cvs-ioctl_debug.patch b/0008-qemu-cvs-ioctl_debug.patch
index be0e3ae5..c776fab8 100644
--- a/0008-qemu-cvs-ioctl_debug.patch
+++ b/0008-qemu-cvs-ioctl_debug.patch
@@ -1,4 +1,4 @@
-From 8dc46c127a963025f6007b81ed0337c3ee836d9a Mon Sep 17 00:00:00 2001
+From 3b21200fd89d9e3b840a226a2d506e742a4bdc02 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:26:33 +0200
 Subject: [PATCH] qemu-cvs-ioctl_debug
diff --git a/0009-qemu-cvs-ioctl_nodirection.patch b/0009-qemu-cvs-ioctl_nodirection.patch
index 2b1efec9..308b437b 100644
--- a/0009-qemu-cvs-ioctl_nodirection.patch
+++ b/0009-qemu-cvs-ioctl_nodirection.patch
@@ -1,4 +1,4 @@
-From 9c3cb55b0234c15d054d2076f7b3311da6051a7a Mon Sep 17 00:00:00 2001
+From 0cf9b5c4dab2e9bc57c405d58f02f13ded7fe8bd Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:27:36 +0200
 Subject: [PATCH] qemu-cvs-ioctl_nodirection
diff --git a/0010-block-vmdk-Support-creation-of-SCSI.patch b/0010-block-vmdk-Support-creation-of-SCSI.patch
index f0e6259b..7edfc49a 100644
--- a/0010-block-vmdk-Support-creation-of-SCSI.patch
+++ b/0010-block-vmdk-Support-creation-of-SCSI.patch
@@ -1,4 +1,4 @@
-From a407a470a946fb16deb54e5927841ee12e528ad5 Mon Sep 17 00:00:00 2001
+From 38f2bc40a08ec811b22e60dd4b71fa11b0f11e61 Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:37:42 +0200
 Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img
diff --git a/0011-linux-user-add-binfmt-wrapper-for-a.patch b/0011-linux-user-add-binfmt-wrapper-for-a.patch
index dd65cc4c..90318fb0 100644
--- a/0011-linux-user-add-binfmt-wrapper-for-a.patch
+++ b/0011-linux-user-add-binfmt-wrapper-for-a.patch
@@ -1,4 +1,4 @@
-From c53619914f2bf66549b31da08dfbf58e7c3b7fab Mon Sep 17 00:00:00 2001
+From 18eb0ea2c1656ebd3bc875ada67f73a4b36e13a1 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 30 Sep 2011 19:40:36 +0200
 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
diff --git a/0012-PPC-KVM-Disable-mmu-notifier-check.patch b/0012-PPC-KVM-Disable-mmu-notifier-check.patch
index 9c22b49f..f6703807 100644
--- a/0012-PPC-KVM-Disable-mmu-notifier-check.patch
+++ b/0012-PPC-KVM-Disable-mmu-notifier-check.patch
@@ -1,4 +1,4 @@
-From c251b8da7c001b77889265bc97df5420db189549 Mon Sep 17 00:00:00 2001
+From 63b90611b240cc52fc311f0f13eff5b8cca0524e Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 6 Jan 2012 01:05:55 +0100
 Subject: [PATCH] PPC: KVM: Disable mmu notifier check
diff --git a/0013-linux-user-fix-segfault-deadlock.patch b/0013-linux-user-fix-segfault-deadlock.patch
index dd8b7781..8bf8ed51 100644
--- a/0013-linux-user-fix-segfault-deadlock.patch
+++ b/0013-linux-user-fix-segfault-deadlock.patch
@@ -1,4 +1,4 @@
-From 065e4710e6dea5733f01a7cfaf05ed3d75c57bae Mon Sep 17 00:00:00 2001
+From 58a7f89554d2de5bb2ef05c43f97fccdad8c54e0 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 13 Jan 2012 17:05:41 +0100
 Subject: [PATCH] linux-user: fix segfault deadlock
diff --git a/0014-linux-user-binfmt-support-host-bina.patch b/0014-linux-user-binfmt-support-host-bina.patch
index a405e619..a0b74cc0 100644
--- a/0014-linux-user-binfmt-support-host-bina.patch
+++ b/0014-linux-user-binfmt-support-host-bina.patch
@@ -1,4 +1,4 @@
-From 0211f43a1ab28a0b37c07b1e04714918429df3d7 Mon Sep 17 00:00:00 2001
+From cb2967f20959e9907669a2332ccd164f40351007 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 2 Feb 2012 18:02:33 +0100
 Subject: [PATCH] linux-user: binfmt: support host binaries
diff --git a/0015-linux-user-Ignore-broken-loop-ioctl.patch b/0015-linux-user-Ignore-broken-loop-ioctl.patch
index 6776aa88..5b5b726e 100644
--- a/0015-linux-user-Ignore-broken-loop-ioctl.patch
+++ b/0015-linux-user-Ignore-broken-loop-ioctl.patch
@@ -1,4 +1,4 @@
-From ea5eaad61f12333cfdb47790b88758cac422f482 Mon Sep 17 00:00:00 2001
+From 1b00c1b548b8e05ce687a73d46f0c08f698edc0a Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 12 Jun 2012 04:41:10 +0200
 Subject: [PATCH] linux-user: Ignore broken loop ioctl
diff --git a/0016-linux-user-lock-tcg.patch b/0016-linux-user-lock-tcg.patch
index 5bf97975..f5e48bd8 100644
--- a/0016-linux-user-lock-tcg.patch
+++ b/0016-linux-user-lock-tcg.patch
@@ -1,4 +1,4 @@
-From 60439572489f596910d76960312c0dfe81af65d3 Mon Sep 17 00:00:00 2001
+From a2f780a45d6b328e1b2ed383784cd690bd3bb529 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 5 Jul 2012 17:31:39 +0200
 Subject: [PATCH] linux-user: lock tcg
diff --git a/0017-linux-user-Run-multi-threaded-code-.patch b/0017-linux-user-Run-multi-threaded-code-.patch
index 74db367a..f1cd430c 100644
--- a/0017-linux-user-Run-multi-threaded-code-.patch
+++ b/0017-linux-user-Run-multi-threaded-code-.patch
@@ -1,4 +1,4 @@
-From 8bee3d7d35a2acf03d999155ac75fdb09894ad73 Mon Sep 17 00:00:00 2001
+From 32acfcfbaf593e8d657b5a09b48d05871250d444 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 10 Jul 2012 20:40:55 +0200
 Subject: [PATCH] linux-user: Run multi-threaded code on a single core
diff --git a/0018-linux-user-lock-tb-flushing-too.patch b/0018-linux-user-lock-tb-flushing-too.patch
index df3fc3ae..7ee93ed6 100644
--- a/0018-linux-user-lock-tb-flushing-too.patch
+++ b/0018-linux-user-lock-tb-flushing-too.patch
@@ -1,4 +1,4 @@
-From 4abad73714e74172bdde4a0a4d9096d35ec81729 Mon Sep 17 00:00:00 2001
+From b447299e5493e4a6593e0ddde084e0ee59070199 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 11 Jul 2012 16:47:42 +0200
 Subject: [PATCH] linux-user: lock tb flushing too
diff --git a/0019-linux-user-Fake-proc-cpuinfo.patch b/0019-linux-user-Fake-proc-cpuinfo.patch
index faa0eb62..b6f48648 100644
--- a/0019-linux-user-Fake-proc-cpuinfo.patch
+++ b/0019-linux-user-Fake-proc-cpuinfo.patch
@@ -1,4 +1,4 @@
-From a85b02f1372d1239d20b18d879aacd4837a69579 Mon Sep 17 00:00:00 2001
+From 83f8760297c5fac596c82a9e45449895071b90af Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 23 Jul 2012 10:24:14 +0200
 Subject: [PATCH] linux-user: Fake /proc/cpuinfo
diff --git a/0020-linux-user-implement-FS_IOC_GETFLAG.patch b/0020-linux-user-implement-FS_IOC_GETFLAG.patch
index 96bd625a..13e57664 100644
--- a/0020-linux-user-implement-FS_IOC_GETFLAG.patch
+++ b/0020-linux-user-implement-FS_IOC_GETFLAG.patch
@@ -1,4 +1,4 @@
-From 57d487b1586cf3733da768969fb42729037243aa Mon Sep 17 00:00:00 2001
+From a7efb638bab217add93f4199939037730df222ba Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 20 Aug 2012 00:02:52 +0200
 Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl
diff --git a/0021-linux-user-implement-FS_IOC_SETFLAG.patch b/0021-linux-user-implement-FS_IOC_SETFLAG.patch
index 07796796..842143a6 100644
--- a/0021-linux-user-implement-FS_IOC_SETFLAG.patch
+++ b/0021-linux-user-implement-FS_IOC_SETFLAG.patch
@@ -1,4 +1,4 @@
-From cd45cf15a1401713f2055de888c00dba8878e614 Mon Sep 17 00:00:00 2001
+From de8637cc5c349ec197315c9a06ca6163e3ca8dd1 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 20 Aug 2012 00:07:13 +0200
 Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl
diff --git a/0022-linux-user-XXX-disable-fiemap.patch b/0022-linux-user-XXX-disable-fiemap.patch
index 402eacb8..4aa000e7 100644
--- a/0022-linux-user-XXX-disable-fiemap.patch
+++ b/0022-linux-user-XXX-disable-fiemap.patch
@@ -1,4 +1,4 @@
-From 70eb57de6f8010f9e8d585519e011d46ae6c8aa9 Mon Sep 17 00:00:00 2001
+From 5d92384080c5f450560412313661ab0e84c42bd8 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 21 Aug 2012 14:20:40 +0200
 Subject: [PATCH] linux-user: XXX disable fiemap
diff --git a/0023-slirp-nooutgoing.patch b/0023-slirp-nooutgoing.patch
index 195f1c54..001414f5 100644
--- a/0023-slirp-nooutgoing.patch
+++ b/0023-slirp-nooutgoing.patch
@@ -1,4 +1,4 @@
-From fbefb2fcd0119947744fc32ffa29610d2615faaa Mon Sep 17 00:00:00 2001
+From 7f2436d3ad31d2fd264f8dd9188abdb9a3bebae6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 29 Aug 2012 18:42:56 +0200
 Subject: [PATCH] slirp: -nooutgoing
diff --git a/0024-vnc-password-file-and-incoming-conn.patch b/0024-vnc-password-file-and-incoming-conn.patch
index 5c455be2..b5bce2ce 100644
--- a/0024-vnc-password-file-and-incoming-conn.patch
+++ b/0024-vnc-password-file-and-incoming-conn.patch
@@ -1,4 +1,4 @@
-From ad199458d919cf30edf0f77f2862044efb551617 Mon Sep 17 00:00:00 2001
+From 1e17a16e5d7ac68f2679407f5468d11b73644f6b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 29 Aug 2012 20:06:01 +0200
 Subject: [PATCH] vnc: password-file= and incoming-connections=
diff --git a/0025-linux-user-add-more-blk-ioctls.patch b/0025-linux-user-add-more-blk-ioctls.patch
index 526de4ff..c8b316f2 100644
--- a/0025-linux-user-add-more-blk-ioctls.patch
+++ b/0025-linux-user-add-more-blk-ioctls.patch
@@ -1,4 +1,4 @@
-From 84badc38e3d460cb742674ab90715d649d2a73e8 Mon Sep 17 00:00:00 2001
+From 58d1cb20e7dbeddef1e12fd2dfac4fe2a9c16cff Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 10 Oct 2012 10:21:20 +0200
 Subject: [PATCH] linux-user: add more blk ioctls
diff --git a/0026-linux-user-use-target_ulong.patch b/0026-linux-user-use-target_ulong.patch
index fcaec278..46a3e98b 100644
--- a/0026-linux-user-use-target_ulong.patch
+++ b/0026-linux-user-use-target_ulong.patch
@@ -1,4 +1,4 @@
-From 9fac136f97719147fd1a47c93096232e79e21e6e Mon Sep 17 00:00:00 2001
+From 4541994ba978226f288028aec1b9868efcc5ea9f Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 9 Oct 2012 09:06:49 +0200
 Subject: [PATCH] linux-user: use target_ulong
diff --git a/0027-block-Add-support-for-DictZip-enabl.patch b/0027-block-Add-support-for-DictZip-enabl.patch
index f6bd98e7..8bedba5b 100644
--- a/0027-block-Add-support-for-DictZip-enabl.patch
+++ b/0027-block-Add-support-for-DictZip-enabl.patch
@@ -1,4 +1,4 @@
-From 2d455b932b1cbe4e15aca1e579ccece912a8e00e Mon Sep 17 00:00:00 2001
+From ded0e437f0cc9df0f0508f166db14cc54aaad784 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 5 Aug 2009 09:49:37 +0200
 Subject: [PATCH] block: Add support for DictZip enabled gzip files
diff --git a/0028-block-Add-tar-container-format.patch b/0028-block-Add-tar-container-format.patch
index 0b308025..9b4ae832 100644
--- a/0028-block-Add-tar-container-format.patch
+++ b/0028-block-Add-tar-container-format.patch
@@ -1,4 +1,4 @@
-From c736496ab4394f9d527cb0c03ef5c935675b79e6 Mon Sep 17 00:00:00 2001
+From 6b8c3885607cbbbc5eb5a6b6c08e64eeabd639a5 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 5 Aug 2009 17:28:38 +0200
 Subject: [PATCH] block: Add tar container format
diff --git a/0029-Legacy-Patch-kvm-qemu-preXX-dictzip.patch b/0029-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
index 4a6d9029..19f0bdc1 100644
--- a/0029-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
+++ b/0029-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
@@ -1,4 +1,4 @@
-From 97f38088736b7f86a4d6c819b811e61b9f9e1a6f Mon Sep 17 00:00:00 2001
+From 36f1cdefb3ffc0b3e96f544ef3280dca57ea2e4c Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 12 Dec 2012 19:11:30 +0100
 Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
diff --git a/0030-console-add-question-mark-escape-op.patch b/0030-console-add-question-mark-escape-op.patch
index f5cefc99..f245ad26 100644
--- a/0030-console-add-question-mark-escape-op.patch
+++ b/0030-console-add-question-mark-escape-op.patch
@@ -1,4 +1,4 @@
-From aa584419665b3207b11e38643c9c2f0a0195000f Mon Sep 17 00:00:00 2001
+From aaa848743a9634205cf4459ae12993673d428cc6 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 6 Jun 2011 06:53:52 +0200
 Subject: [PATCH] console: add question-mark escape operator
diff --git a/0031-Make-char-muxer-more-robust-wrt-sma.patch b/0031-Make-char-muxer-more-robust-wrt-sma.patch
index 677ef89d..66308fe6 100644
--- a/0031-Make-char-muxer-more-robust-wrt-sma.patch
+++ b/0031-Make-char-muxer-more-robust-wrt-sma.patch
@@ -1,4 +1,4 @@
-From 2dad2c192f7d5c048aa6391f64f12443768ce08a Mon Sep 17 00:00:00 2001
+From 373aff92ccca07533a1bac043ccccbe8d1edb322 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 1 Apr 2010 17:36:23 +0200
 Subject: [PATCH] Make char muxer more robust wrt small FIFOs
diff --git a/0032-linux-user-lseek-explicitly-cast-no.patch b/0032-linux-user-lseek-explicitly-cast-no.patch
index ac2f8ad9..47adeb06 100644
--- a/0032-linux-user-lseek-explicitly-cast-no.patch
+++ b/0032-linux-user-lseek-explicitly-cast-no.patch
@@ -1,4 +1,4 @@
-From 4947d80705274b6a5e14b23d239c4e8ceb1b55bc Mon Sep 17 00:00:00 2001
+From 21c375ae2e6cfc6dc7b6eb0bca58e127cdddfa63 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 13 Dec 2012 14:29:22 +0100
 Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed
diff --git a/0033-virtfs-proxy-helper-Provide-__u64-f.patch b/0033-virtfs-proxy-helper-Provide-__u64-f.patch
index 0557984b..e2a0e230 100644
--- a/0033-virtfs-proxy-helper-Provide-__u64-f.patch
+++ b/0033-virtfs-proxy-helper-Provide-__u64-f.patch
@@ -1,4 +1,4 @@
-From 391dffa6e0f732534069fdd75f8c536d05f815a5 Mon Sep 17 00:00:00 2001
+From f8d920c04363d2059f43d81569bf68324bf52999 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Thu, 16 May 2013 12:39:10 +0200
 Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken
diff --git a/0034-configure-Enable-PIE-for-ppc-and-pp.patch b/0034-configure-Enable-PIE-for-ppc-and-pp.patch
index ad2feaa8..c138b90b 100644
--- a/0034-configure-Enable-PIE-for-ppc-and-pp.patch
+++ b/0034-configure-Enable-PIE-for-ppc-and-pp.patch
@@ -1,4 +1,4 @@
-From 9ee7949a7ec99bec9b43a93b7cdb8a0a87065162 Mon Sep 17 00:00:00 2001
+From 0c1e38643a275316ed01c40c085bec3f0d91af3d Mon Sep 17 00:00:00 2001
 From: Dinar Valeev <k0da@opensuse.org>
 Date: Wed, 2 Oct 2013 17:56:03 +0200
 Subject: [PATCH] configure: Enable PIE for ppc and ppc64 hosts
diff --git a/0035-qtest-Increase-socket-timeout.patch b/0035-qtest-Increase-socket-timeout.patch
index b2a9deff..44df4022 100644
--- a/0035-qtest-Increase-socket-timeout.patch
+++ b/0035-qtest-Increase-socket-timeout.patch
@@ -1,4 +1,4 @@
-From 3c6d74b3d828b2cd0b5119417f78a5ed0c0457dd Mon Sep 17 00:00:00 2001
+From 93d5e4be4758d956a6f9751c468432a105cc5084 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 17 Apr 2014 18:39:10 +0200
 Subject: [PATCH] qtest: Increase socket timeout
diff --git a/0036-AIO-Reduce-number-of-threads-for-32.patch b/0036-AIO-Reduce-number-of-threads-for-32.patch
index 262608fa..5ffb5430 100644
--- a/0036-AIO-Reduce-number-of-threads-for-32.patch
+++ b/0036-AIO-Reduce-number-of-threads-for-32.patch
@@ -1,4 +1,4 @@
-From 99e265089d1a25b181c7617cf49b8bb45904b7e8 Mon Sep 17 00:00:00 2001
+From 93385f479c5d050d6361d6835a2da091555b380a Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 14 Jan 2015 01:32:11 +0100
 Subject: [PATCH] AIO: Reduce number of threads for 32bit hosts
diff --git a/0037-linux-user-Allocate-thunk-size-dyna.patch b/0037-linux-user-Allocate-thunk-size-dyna.patch
index a9e95f9b..7a9fcfa1 100644
--- a/0037-linux-user-Allocate-thunk-size-dyna.patch
+++ b/0037-linux-user-Allocate-thunk-size-dyna.patch
@@ -1,4 +1,4 @@
-From 2a3eca4a9a383f7aeab27f02812a8e5982036dab Mon Sep 17 00:00:00 2001
+From cead420737c71cbf46775b02815ff1ef7f7ee257 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2015 17:12:29 +0200
 Subject: [PATCH] linux-user: Allocate thunk size dynamically
diff --git a/0038-Revert-Revert-seccomp-tests-that-al.patch b/0038-Revert-Revert-seccomp-tests-that-al.patch
index 0ebe5a2a..79a8b9eb 100644
--- a/0038-Revert-Revert-seccomp-tests-that-al.patch
+++ b/0038-Revert-Revert-seccomp-tests-that-al.patch
@@ -1,4 +1,4 @@
-From b5ce5675b1a44f5e96a332fec001ee358a5b12eb Mon Sep 17 00:00:00 2001
+From 0cf7218bdc4ee50a2554db9074c3366a09ca16ce Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Tue, 14 Apr 2015 18:42:06 +0200
 Subject: [PATCH] Revert "Revert seccomp tests that allow it to be used on
diff --git a/0039-s390x-Fix-stoc-direction.patch b/0039-s390x-Fix-stoc-direction.patch
index 627d2af9..a3dc78b1 100644
--- a/0039-s390x-Fix-stoc-direction.patch
+++ b/0039-s390x-Fix-stoc-direction.patch
@@ -1,4 +1,4 @@
-From ffb41747e820f96c053b35640d9f2c621248f03d Mon Sep 17 00:00:00 2001
+From a8187b81c7ac84123ac4e4fb78d9219473fae1fa Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 15 Apr 2015 02:28:05 +0200
 Subject: [PATCH] s390x: Fix stoc direction
diff --git a/libcacard.changes b/libcacard.changes
index be376bd5..acce4449 100644
--- a/libcacard.changes
+++ b/libcacard.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 29 14:53:51 UTC 2015 - afaerber@suse.de
+
+- Update to v2.3.0: See http://wiki.qemu-project.org/ChangeLog/2.3
+
 -------------------------------------------------------------------
 Wed Apr 22 10:59:13 UTC 2015 - afaerber@suse.de
 
diff --git a/libcacard.spec b/libcacard.spec
index d2d406b7..3e006294 100644
--- a/libcacard.spec
+++ b/libcacard.spec
@@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.2.94
+Version:        2.3.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc4.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patch
 Patch0002:      0002-XXX-work-around-SA_RESTART-race-wit.patch
@@ -122,7 +122,7 @@ the cards could be pure software constructs.
 This sub-package contains development files for the Smartcard library.
 
 %prep
-%setup -q -n qemu-2.3.0-rc4
+%setup -q -n qemu-2.3.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
diff --git a/libcacard.spec.in b/libcacard.spec.in
index e92e2b1c..e69c72c2 100644
--- a/libcacard.spec.in
+++ b/libcacard.spec.in
@@ -23,7 +23,7 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc4.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 PATCH_FILES
 # Please do not add patches manually here, run update_git.sh.
@@ -84,7 +84,7 @@ the cards could be pure software constructs.
 This sub-package contains development files for the Smartcard library.
 
 %prep
-%setup -q -n qemu-2.3.0-rc4
+%setup -q -n qemu-2.3.0
 PATCH_EXEC
 
 %build
diff --git a/qemu-2.3.0-rc4.tar.bz2 b/qemu-2.3.0-rc4.tar.bz2
deleted file mode 100644
index efc09bbd..00000000
--- a/qemu-2.3.0-rc4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e5c52e0cc5e4aacfa1d5572c2ba38c4db3369c9dcc71f73312adf64a9d8c1a3
-size 24690124
diff --git a/qemu-2.3.0-rc4.tar.bz2.sig b/qemu-2.3.0-rc4.tar.bz2.sig
deleted file mode 100644
index e97870ab..00000000
Binary files a/qemu-2.3.0-rc4.tar.bz2.sig and /dev/null differ
diff --git a/qemu-2.3.0.tar.bz2 b/qemu-2.3.0.tar.bz2
new file mode 100644
index 00000000..9ca97db6
--- /dev/null
+++ b/qemu-2.3.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588
+size 24683085
diff --git a/qemu-2.3.0.tar.bz2.sig b/qemu-2.3.0.tar.bz2.sig
new file mode 100644
index 00000000..b9fb9d85
Binary files /dev/null and b/qemu-2.3.0.tar.bz2.sig differ
diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes
index d41070fe..4ae160c9 100644
--- a/qemu-linux-user.changes
+++ b/qemu-linux-user.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 29 14:53:51 UTC 2015 - afaerber@suse.de
+
+- Update to v2.3.0: See http://wiki.qemu-project.org/ChangeLog/2.3
+
 -------------------------------------------------------------------
 Wed Apr 22 10:59:13 UTC 2015 - afaerber@suse.de
 
diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec
index e82778b0..e15d96a8 100644
--- a/qemu-linux-user.spec
+++ b/qemu-linux-user.spec
@@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.2.94
+Version:        2.3.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc4.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patch
 Patch0002:      0002-XXX-work-around-SA_RESTART-race-wit.patch
@@ -116,7 +116,7 @@ emulations. This can be used together with the OBS build script to
 run cross-architecture builds.
 
 %prep
-%setup -q -n qemu-2.3.0-rc4
+%setup -q -n qemu-2.3.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
diff --git a/qemu-linux-user.spec.in b/qemu-linux-user.spec.in
index 02a8ea22..9cc79200 100644
--- a/qemu-linux-user.spec.in
+++ b/qemu-linux-user.spec.in
@@ -23,7 +23,7 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc4.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 PATCH_FILES
 # Please do not add patches manually here, run update_git.sh.
@@ -78,7 +78,7 @@ emulations. This can be used together with the OBS build script to
 run cross-architecture builds.
 
 %prep
-%setup -q -n qemu-2.3.0-rc4
+%setup -q -n qemu-2.3.0
 PATCH_EXEC
 
 %build
diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes
index eaac3045..21f906ee 100644
--- a/qemu-testsuite.changes
+++ b/qemu-testsuite.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 29 14:53:51 UTC 2015 - afaerber@suse.de
+
+- Update to v2.3.0: See http://wiki.qemu-project.org/ChangeLog/2.3
+- Disable iotests for now
+
 -------------------------------------------------------------------
 Wed Apr 22 10:59:13 UTC 2015 - afaerber@suse.de
 
diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec
index 8a8ed0f5..c9b653b0 100644
--- a/qemu-testsuite.spec
+++ b/qemu-testsuite.spec
@@ -43,10 +43,10 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.2.94
+Version:        2.3.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc4.tar.bz2
-Source99:       http://wiki.qemu.org/download/qemu-2.3.0-rc4.tar.bz2.sig
+Source:         http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2
+Source99:       http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -554,7 +554,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.3.0-rc4
+%setup -q -n qemu-2.3.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -782,9 +782,10 @@ export QEMU_NBD_PROG=%{_bindir}/qemu-nbd
 make tests/qemu-iotests/socket_scm_helper V=1
 pushd tests/qemu-iotests
 # -qcow 001 seems to hang?
-for fmt in -raw -bochs -cloop -parallels -qcow2 -qed -vdi -vpc -vhdx -vmdk; do
-  ./check -v -T $fmt -file -g quick || true
-done
+# TODO investigate hangs and failures
+#for fmt in -raw -bochs -cloop -parallels -qcow2 -qed -vdi -vpc -vhdx -vmdk; do
+#  ./check -v -T $fmt -file -g quick || true
+#done
 popd
 %endif
 
diff --git a/qemu.changes b/qemu.changes
index eaac3045..21f906ee 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 29 14:53:51 UTC 2015 - afaerber@suse.de
+
+- Update to v2.3.0: See http://wiki.qemu-project.org/ChangeLog/2.3
+- Disable iotests for now
+
 -------------------------------------------------------------------
 Wed Apr 22 10:59:13 UTC 2015 - afaerber@suse.de
 
diff --git a/qemu.spec b/qemu.spec
index 3a256769..b8ef3430 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -43,10 +43,10 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.2.94
+Version:        2.3.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc4.tar.bz2
-Source99:       http://wiki.qemu.org/download/qemu-2.3.0-rc4.tar.bz2.sig
+Source:         http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2
+Source99:       http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -554,7 +554,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.3.0-rc4
+%setup -q -n qemu-2.3.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -782,9 +782,10 @@ export QEMU_NBD_PROG=%{_bindir}/qemu-nbd
 make tests/qemu-iotests/socket_scm_helper V=1
 pushd tests/qemu-iotests
 # -qcow 001 seems to hang?
-for fmt in -raw -bochs -cloop -parallels -qcow2 -qed -vdi -vpc -vhdx -vmdk; do
-  ./check -v -T $fmt -file -g quick || true
-done
+# TODO investigate hangs and failures
+#for fmt in -raw -bochs -cloop -parallels -qcow2 -qed -vdi -vpc -vhdx -vmdk; do
+#  ./check -v -T $fmt -file -g quick || true
+#done
 popd
 %endif
 
diff --git a/qemu.spec.in b/qemu.spec.in
index 065c4de4..b0c34a1a 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -45,8 +45,8 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc4.tar.bz2
-Source99:       http://wiki.qemu.org/download/qemu-2.3.0-rc4.tar.bz2.sig
+Source:         http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2
+Source99:       http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -516,7 +516,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.3.0-rc4
+%setup -q -n qemu-2.3.0
 PATCH_EXEC
 
 %if %{build_x86_fw_from_source}
@@ -706,9 +706,10 @@ export QEMU_NBD_PROG=%{_bindir}/qemu-nbd
 make tests/qemu-iotests/socket_scm_helper V=1
 pushd tests/qemu-iotests
 # -qcow 001 seems to hang?
-for fmt in -raw -bochs -cloop -parallels -qcow2 -qed -vdi -vpc -vhdx -vmdk; do
-  ./check -v -T $fmt -file -g quick || true
-done
+# TODO investigate hangs and failures
+#for fmt in -raw -bochs -cloop -parallels -qcow2 -qed -vdi -vpc -vhdx -vmdk; do
+#  ./check -v -T $fmt -file -g quick || true
+#done
 popd
 %endif
 
diff --git a/update_git.sh b/update_git.sh
index e4b0af96..6b229b07 100644
--- a/update_git.sh
+++ b/update_git.sh
@@ -12,7 +12,7 @@
 GIT_TREE=git://github.com/openSUSE/qemu.git
 GIT_LOCAL_TREE=~/git/qemu-opensuse
 GIT_BRANCH=opensuse-2.3
-GIT_UPSTREAM_TAG=v2.3.0-rc4
+GIT_UPSTREAM_TAG=v2.3.0
 GIT_DIR=/dev/shm/qemu-factory-git-dir
 CMP_DIR=/dev/shm/qemu-factory-cmp-dir