diff --git a/qemu-cvs-atapi.patch b/qemu-cvs-atapi.patch
new file mode 100644
index 00000000..f69fa59b
--- /dev/null
+++ b/qemu-cvs-atapi.patch
@@ -0,0 +1,25 @@
+Index: qemu-0.9.0/hw/ide.c
+===================================================================
+--- qemu-0.9.0.orig/hw/ide.c
++++ qemu-0.9.0/hw/ide.c
+@@ -586,7 +586,9 @@ static void ide_transfer_start(IDEState 
+     s->end_transfer_func = end_transfer_func;
+     s->data_ptr = buf;
+     s->data_end = buf + size;
+-    s->status |= DRQ_STAT;
++    /* don't violate the HSM */
++    if (!(s->status & ERR_STAT))
++        s->status |= DRQ_STAT;
+ }
+ 
+ static void ide_transfer_stop(IDEState *s)
+@@ -1805,6 +1807,7 @@ static void ide_ioport_write(void *opaqu
+             /* overlapping commands not supported */
+             if (s->feature & 0x02)
+                 goto abort_cmd;
++            s->status = READY_STAT;
+             s->atapi_dma = s->feature & 1;
+             s->nsector = 1;
+             ide_transfer_start(s, s->io_buffer, ATAPI_PACKET_SIZE, 
+
+
diff --git a/qemu.changes b/qemu.changes
index b49d5f84..ec660a5c 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 20 11:05:39 CEST 2007 - agraf@suse.de
+
+- fix ATAPI bug when using libata (Brandon Philips)  (#291775)
+
 -------------------------------------------------------------------
 Sat Aug 11 09:20:48 CEST 2007 - olh@suse.de
 
diff --git a/qemu.spec b/qemu.spec
index 9e4d1b10..3f7470ba 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:        17
+Release:        21
 Source:         %name-%version.tar.bz2
 #Patch400: qemu-0.7.0-gcc4-dot-syms.patch
 #Patch401: qemu-0.8.0-gcc4-hacks.patch
@@ -58,6 +58,7 @@ Patch68:        qemu-0.8.3-gcc4.patch
 Patch69:        qemu-cvs-ia64.patch
 Patch70:        qemu-m68k.diff
 Patch71:        qemu-s390.patch
+Patch72:        qemu-cvs-atapi.patch
 Source200:      kvm_bios.bin
 Source201:      zx-rom.bin
 Source202:      COPYING.zx-rom
@@ -157,6 +158,7 @@ Authors:
 %patch69
 %patch70
 %patch71 -p1
+%patch72 -p1
 %ifarch ia64 ppc64
 #this is the dyngen for gcc4 patch (does not work on x86)
 %patch68 -p1
@@ -309,6 +311,8 @@ rm -rf %{gcc33tmp}
 %endif
 
 %changelog
+* Mon Aug 20 2007 - agraf@suse.de
+- fix ATAPI bug when using libata (Brandon Philips)  (#291775)
 * Sat Aug 11 2007 - olh@suse.de
 - disable only SNDRV_SB_CSP_IOCTL_LOAD_CODE for _IOC_SIZEBITS < 14
 * Thu Aug 09 2007 - olh@suse.de