diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index 9b9043269..81e30f3a1 100644
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@@ -14,7 +14,8 @@ LINUX_VERSION:=2.6.35.9
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += kmod-switch gpioctl
+DEFAULT_PACKAGES += kmod-switch gpioctl kmod-input-gpio-buttons \
+	kmod-leds-gpio kmod-button-hotplug
 
 define Target/Description
 	Build firmware images for Broadcom based xDSL/routers
diff --git a/target/linux/brcm63xx/profiles/200-GW6X00.mk b/target/linux/brcm63xx/profiles/200-GW6X00.mk
index fed835b6f..71100bd5a 100644
--- a/target/linux/brcm63xx/profiles/200-GW6X00.mk
+++ b/target/linux/brcm63xx/profiles/200-GW6X00.mk
@@ -10,9 +10,7 @@ define Profile/GW6X00
   PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-usb-storage \
 	kmod-fs-ext2 kmod-nls-cp437 kmod-nls-iso8859-1 kmod-fs-vfat \
 	kmod-loop e2fsprogs kmod-spi-bitbang kmod-bcm63xx-spi \
-	kmod-ipt-nathelper-extra kmod-input-gpio-buttons \
-	kmod-leds-gpio kmod-button-hotplug \
-	wl wlc
+	kmod-ipt-nathelper-extra wl wlc
 endef
 
 define Profile/GW6X00/Description