diff --git a/Makefile b/Makefile
index 5df8b21a9..2a87029f7 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,7 @@ debug:
 	@perl -pi -e 's/# CONFIG_EXT4_DEBUG is not set/CONFIG_EXT4_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_PERF_USE_VMALLOC is not set/CONFIG_DEBUG_PERF_USE_VMALLOC=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_JBD2_DEBUG is not set/CONFIG_JBD2_DEBUG=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_NFSD_FAULT_INJECTION is not set/CONFIG_NFSD_FAULT_INJECTION=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_BLK_CGROUP is not set/CONFIG_DEBUG_BLK_CGROUP=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DRBD_FAULT_INJECTION is not set/CONFIG_DRBD_FAULT_INJECTION=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_ATH_DEBUG is not set/CONFIG_ATH_DEBUG=y/' config-nodebug
diff --git a/Makefile.release b/Makefile.release
index 85fa9897b..e3ad8071a 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -51,6 +51,7 @@ config-release:
 	@perl -pi -e 's/CONFIG_EXT4_DEBUG=y/# CONFIG_EXT4_DEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_PERF_USE_VMALLOC=y/# CONFIG_DEBUG_PERF_USE_VMALLOC is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_JBD2_DEBUG=y/# CONFIG_JBD2_DEBUG is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_NFSD_FAULT_INJECTION=y/# CONFIG_NFSD_FAULT_INJECTION is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_BLK_CGROUP=y/# CONFIG_DEBUG_BLK_CGROUP is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DRBD_FAULT_INJECTION=y/# CONFIG_DRBD_FAULT_INJECTION is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_ATH_DEBUG=y/# CONFIG_ATH_DEBUG is not set/' config-nodebug
diff --git a/config-debug b/config-debug
index 03964c6c4..b9334f4ac 100644
--- a/config-debug
+++ b/config-debug
@@ -72,6 +72,8 @@ CONFIG_DEBUG_PERF_USE_VMALLOC=y
 
 CONFIG_JBD2_DEBUG=y
 
+CONFIG_NFSD_FAULT_INJECTION=y
+
 CONFIG_DEBUG_BLK_CGROUP=y
 
 CONFIG_DRBD_FAULT_INJECTION=y
diff --git a/config-generic b/config-generic
index dafc6c001..8685d871e 100644
--- a/config-generic
+++ b/config-generic
@@ -3571,8 +3571,6 @@ CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-# Maybe see if we want this on for debug kernels?
-# CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_NEW_IDMAPPER=y
diff --git a/config-nodebug b/config-nodebug
index c14754265..485f1b0af 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -72,6 +72,8 @@ CONFIG_DEBUG_PERF_USE_VMALLOC=y
 
 CONFIG_JBD2_DEBUG=y
 
+CONFIG_NFSD_FAULT_INJECTION=y
+
 CONFIG_DEBUG_BLK_CGROUP=y
 
 CONFIG_DRBD_FAULT_INJECTION=y
diff --git a/kernel.spec b/kernel.spec
index 2c513f7fd..53b5feebd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2327,6 +2327,7 @@ fi
 #                 ||     ||
 %changelog
 * Fri May 11 2012 Josh Boyer <jwboyer@redaht.com>
+- Enable CONFIG_NFSD_FAULT_INJECTION on debug builds (suggested by Jeff Layton)
 - Enable CONFIG_SUNRPC_DEBUG (pointed out by Jeff Layton)
 
 * Fri May 11 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc6.git3.1