diff --git a/debian/changelog b/debian/changelog
index b1e1dc4c7..67651bdda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ linux-2.6 (2.6.31~rc1-1~experimental.1) UNRELEASED; urgency=low
   * mga: remove unnecessary change from firmware-loading patch
   * cxgb3: remove PHY firmware
 
+  [ Martin Michlmayr ]
+  * [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these
+    platforms have been converted to GPIOLIB.
+
  -- maximilian attems <maks@debian.org>  Thu, 18 Jun 2009 23:50:56 +0200
 
 linux-2.6 (2.6.30-1) unstable; urgency=low
diff --git a/debian/config/arm/config.orion5x b/debian/config/arm/config.orion5x
index 54a9ec60e..3001e038c 100644
--- a/debian/config/arm/config.orion5x
+++ b/debian/config/arm/config.orion5x
@@ -618,3 +618,5 @@ CONFIG_X25=m
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_MSM7X00A is not set
 
+CONFIG_GPIO_SYSFS=y
+
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 862625214..bb56e3d1a 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -624,3 +624,5 @@ CONFIG_WAN_ROUTER=m
 ##
 CONFIG_X25=m
 
+CONFIG_GPIO_SYSFS=y
+