diff --git a/config-generic b/config-generic
index b9978534e..d2e1345db 100644
--- a/config-generic
+++ b/config-generic
@@ -3474,7 +3474,7 @@ CONFIG_DNOTIFY=y
 CONFIG_AUTOFS4_FS=y
 # CONFIG_EXOFS_FS is not set
 # CONFIG_EXOFS_DEBUG is not set
-# CONFIG_NILFS2_FS is not set
+CONFIG_NILFS2_FS=m
 # CONFIG_LOGFS is not set
 CONFIG_CEPH_FS=m
 CONFIG_BLK_DEV_RBD=m
diff --git a/kernel.spec b/kernel.spec
index 9203aed3b..5cb7a73bd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2335,6 +2335,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue May 15 2012 Josh Boyer <jwboyer@redhat.com>
+- Enable Nilfs2 and put it in modules-extra (rhbz 821702)
+
 * Tue May 15 2012 Dennis Gilmore <dennis@ausil.us> 
 - dont build a up kernel on armv5tel
 
diff --git a/mod-extra.list b/mod-extra.list
index a99603327..d4aefed35 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -176,3 +176,4 @@ tpm_infineon.ko
 tpm_nsc.ko
 tpm_tis.ko
 slip.ko
+nilfs2.ko