diff --git a/config-generic b/config-generic
index 487734473..a1ebab70f 100644
--- a/config-generic
+++ b/config-generic
@@ -3519,19 +3519,11 @@ CONFIG_MFD_CS5535=m
 #
 CONFIG_MISC_FILESYSTEMS=y
 
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
+# ext4 is used for ext2 and ext3 filesystems
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
diff --git a/kernel.spec b/kernel.spec
index de9353655..be1b86e70 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1889,6 +1889,9 @@ fi
 # and build.
 
 %changelog
+* Thu Jul 21 2011 Chuck Ebbert <cebbert@redhat.com>
+- Use ext4 for ext2 and ext3 filesystems (CONFIG_EXT4_USE_FOR_EXT23=y)
+
 * Thu Jul 21 2011 Dave Jones <davej@redhat.com>
 - Switch BLK_DEV_RAM to be modular (rhbz 720833)