diff --git a/config-generic b/config-generic
index d6cb2b7e9..422972e4a 100644
--- a/config-generic
+++ b/config-generic
@@ -3624,7 +3624,11 @@ CONFIG_DLM_DEBUG=y
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_DLM=y
 
-# CONFIG_UBIFS_FS is not set
+
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+# CONFIG_UBIFS_FS_DEBUG is not set
 
 #
 # Partition Types
diff --git a/kernel.spec b/kernel.spec
index a2161c730..82f09befc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2321,6 +2321,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Sep 14 2012 Dave Jones <davej@redhat.com>
+- Reenable UBIFS (rhbz 823238)
+
 * Fri Sep 14 2012 Dave Jones <davej@redhat.com>
 - Fix license tag. (rhbz 450492)
 
diff --git a/mod-extra.list b/mod-extra.list
index b01f05eb4..124d74ef2 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -187,3 +187,4 @@ w1_smem.ko
 w1_ds2431.ko
 w1_ds2423.ko
 w1_bq27000.ko
+ubifs.ko