diff --git a/config-generic b/config-generic
index 312d497a9..a25e79f7e 100644
--- a/config-generic
+++ b/config-generic
@@ -4157,7 +4157,7 @@ CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_W1_MASTER_GPIO is not set
 # CONFIG_LEDS_GPIO is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
diff --git a/kernel.spec b/kernel.spec
index 00ac22d44..f7a86bab8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2104,6 +2104,9 @@ fi
 
 
 %changelog
+* Wed Sep 08 2010 Kyle McMartin <kyle@redhat.com>
+- Enable GPIO_SYSFS. (#631958)
+
 * Sun Sep 05 2010 Jarod Wilson <jarod@redhat.com> 2.6.34.6-54
 - Restore lirc patch from 2.6.33.x F13 kernels, re-fixes multiple issues