diff --git a/dvd+rw-tools-7.1-blocks.patch b/dvd+rw-tools-7.1-blocks.patch
deleted file mode 100644
index 4df6e46..0000000
--- a/dvd+rw-tools-7.1-blocks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up dvd+rw-tools-7.1/growisofs_mmc.cpp.blocks dvd+rw-tools-7.1/growisofs_mmc.cpp
---- dvd+rw-tools-7.1/growisofs_mmc.cpp.blocks	2012-04-06 12:31:49.336132465 +0200
-+++ dvd+rw-tools-7.1/growisofs_mmc.cpp	2012-04-06 12:32:15.131645600 +0200
-@@ -1588,8 +1588,8 @@ static int minus_r_reserve_track (Scsi_C
-   unsigned int blocks;
- 
-     blocks = (unsigned int)(size/2048);
-+    blocks += 15, blocks &= ~15;
-     if (is_dao)	dao_blocks = blocks;
--    else	blocks += 15, blocks &= ~15;
- 
-     fprintf (stderr,"%s: reserving %u blocks",ioctl_device,blocks);
-     if (is_dao && blocks<380000)
diff --git a/dvd+rw-tools-7.1-lastshort.patch b/dvd+rw-tools-7.1-lastshort.patch
new file mode 100644
index 0000000..da225d4
--- /dev/null
+++ b/dvd+rw-tools-7.1-lastshort.patch
@@ -0,0 +1,12 @@
+diff -up dvd+rw-tools-7.1/growisofs_mmc.cpp.lastshort dvd+rw-tools-7.1/growisofs_mmc.cpp
+--- dvd+rw-tools-7.1/growisofs_mmc.cpp.lastshort	2012-04-13 18:09:31.047641524 +0200
++++ dvd+rw-tools-7.1/growisofs_mmc.cpp	2012-04-13 18:09:34.451763587 +0200
+@@ -540,7 +540,7 @@ ssize_t poor_mans_pwrite64 (int fd,const
+ 	// own higher HZ value and disrespects the user-land one.
+ 	// Sending them down as milliseconds is just safer...
+ 	//
+-	if (!(errcode=cmd.transport (WRITE,(void *)buff,size)))
++	if (!(errcode=cmd.transport (WRITE,(void *)buff,nbl*2048)))
+ 	    break;
+ 
+ 	//--- WRITE failed ---//
diff --git a/dvd+rw-tools.spec b/dvd+rw-tools.spec
index c76375c..1572440 100644
--- a/dvd+rw-tools.spec
+++ b/dvd+rw-tools.spec
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	7.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPLv2
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -13,7 +13,7 @@ Patch4: 	dvd+rw-tools-7.0-reload.patch
 Patch5: 	dvd+rw-tools-7.0-wctomb.patch
 Patch6:		dvd+rw-tools-7.0-dvddl.patch
 Patch7:		dvd+rw-tools-7.1-noevent.patch
-Patch8:		dvd+rw-tools-7.1-blocks.patch
+Patch8:		dvd+rw-tools-7.1-lastshort.patch
 URL:		http://fy.chalmers.se/~appro/linux/DVD+RW/
 Requires:	mkisofs >= 2.0
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,7 +32,7 @@ information see http://fy.chalmers.se/~appro/linux/DVD+RW/.
 %patch5 -p0 -b .wctomb
 %patch6 -p0 -b .dvddl
 %patch7 -p1 -b .noevent
-%patch8 -p1 -b .blocks
+%patch8 -p1 -b .lastshort
 
 install -m 644 %{SOURCE1} index.html
 
@@ -56,6 +56,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Mon Apr 16 2012 Honza Horak <hhorak@redhat.com> - 7.1-9
+- Allow buffer length of the block to be shorter than multiple of 16, 
+  even in case of DAO writing (replaces the previous fix)
+  Resolves: #810483
+
 * Fri Apr 06 2012 Honza Horak <hhorak@redhat.com> - 7.1-8
 - Align blocks count to multiple of 16 also in case of DAO writing
   Resolves: #810483