diff --git a/dosfstools-3.0.9-fix-reclaim-file.patch b/dosfstools-3.0.9-fix-reclaim-file.patch
new file mode 100644
index 0000000..1dd621d
--- /dev/null
+++ b/dosfstools-3.0.9-fix-reclaim-file.patch
@@ -0,0 +1,11 @@
+--- dosfstools-3.0.9/src/fat.c.old	2010-01-23 10:13:34.000000000 +0100
++++ dosfstools-3.0.9/src/fat.c	2010-12-10 14:36:29.510247580 +0100
+@@ -486,7 +486,7 @@
+ 	    DIR_ENT de;
+ 	    loff_t offset;
+ 	    files++;
+-	    offset = alloc_rootdir_entry(fs,&de,"FSCK%04dREC");
++	    offset = alloc_rootdir_entry(fs,&de,"FSCK%04d");
+ 	    de.start = CT_LE_W(i&0xffff);
+ 	    if (fs->fat_bits == 32)
+ 		de.starthi = CT_LE_W(i>>16);
diff --git a/dosfstools.spec b/dosfstools.spec
index 3efcf2c..d4aa96a 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,12 +1,14 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
 Version: 3.0.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Applications/System
 Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.bz2
 URL: http://www.daniel-baumann.ch/software/dosfstools/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix buffer overflow in reclaim file (#660154)
+Patch0: dosfstools-3.0.9-fix-reclaim-file.patch
 
 %description
 The dosfstools package includes the mkdosfs and dosfsck utilities,
@@ -15,6 +17,7 @@ drives or on floppies.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-reclaim-file
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing"
@@ -33,6 +36,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jan 07 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.9-4
+- Fixed buffer overflow in reclaim file (#660154)
+
 * Mon May 31 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.9-3
 - Rebuilt with -fno-strict-aliasing