diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 0f92c88..d6be259 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -3,8 +3,8 @@
 
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
-Version: 1.40.8
-Release: 2%{?dist}
+Version: 1.40.9
+Release: 1%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -15,8 +15,7 @@ Source2: blkid_types-wrapper.h
 Source3: uuidd.init
 Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
-Patch3: e2fsprogs-1.40.7-swap-inode-full-fix.patch
-Patch4: e2fsprogs-1.40.8-blkid-swap-tests.patch
+Patch3: e2fsprogs-1.40.8-blkid-swap-tests.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,10 +92,8 @@ SMP systems.
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
-# fix in-inode ea swapping in swap_inode_full
-%patch3 -p1 -b .swapinode
 # check a bit more in swapv1 headers before recognizing as swap
-%patch4 -p1 -b .swapchecks
+%patch3 -p1 -b .swapchecks
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -284,6 +281,9 @@ fi
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Sun Apr 27 2008 Eric Sandeen <esandeen@redhat.com> 1.40.9-1
+- New upstream version
+
 * Fri Mar 14 2008 Eric Sandeen <esandeen@redhat.com> 1.40.8-2
 - Update ext2fs_swap_inode_full() fix to match upstream
 - Check more of swapv1 header in blkid detection (#442937)