diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 893742600762f95d709969f8df279230fc1864a3..948c4615cf411e6f6b1753ada4683512ba50f532 100644
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@@ -15,10 +15,12 @@ LINUX_VERSION:=2.6.28.7
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += hostapd-mini kmod-madwifi kmod-gpio-leds
+DEFAULT_PACKAGES += \
+	kmod-gpio-leds kmod-input-core kmod-input-polldev \
+	kmod-input-gpio-buttons kmod-button-hotplug
 
 define Target/Description
-	Build firmware images for Atheros AR71xx/AR913x based boards
+	Build firmware images for Atheros AR71xx/AR913x based boards.
 endef
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 720be1c1e0f904ea5078ec5f029eb4b1206d04f8..c861dce25bdc780ab42b0b856bc7972849d71ecb 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -189,6 +189,11 @@ define Image/Build/Profile/Default
 	$(call Image/Build/Profile/WP543,$(1))
 endef
 
+define Image/Build/Profile/Madwifi
+	$(call Image/Build/Profile/UBNTRS,$(1))
+	$(call Image/Build/Profile/WP543,$(1))
+endef
+
 define Image/Build/squashfs
 	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 endef
diff --git a/target/linux/ar71xx/profiles/00-default.mk b/target/linux/ar71xx/profiles/00-default.mk
index 5b9df1d5608d83b202a0ddf22a3d8652bf5e06f3..d4044a6f4be32d6579bfb9f2673e2b85b0ec330c 100644
--- a/target/linux/ar71xx/profiles/00-default.mk
+++ b/target/linux/ar71xx/profiles/00-default.mk
@@ -6,7 +6,7 @@
 #
 
 define Profile/Default
-	NAME:=Default
+	NAME:=Default Profile (no WiFi)
 	PACKAGES:=
 endef
 
diff --git a/target/linux/ar71xx/profiles/01-madwifi.mk b/target/linux/ar71xx/profiles/01-madwifi.mk
new file mode 100644
index 0000000000000000000000000000000000000000..6eb17948e6ade8f59f90a6871df2212209b0b39b
--- /dev/null
+++ b/target/linux/ar71xx/profiles/01-madwifi.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Madwifi
+	NAME:=Atheros WiFi (madwifi)
+	PACKAGES:=kmod-madwifi hostapd-mini
+endef
+
+define Profile/Madwifi/Description
+	Package set compatible with hardware using Atheros WiFi cards.
+endef
+$(eval $(call Profile,Madwifi))
diff --git a/target/linux/ar71xx/profiles/compex.mk b/target/linux/ar71xx/profiles/compex.mk
index 468c25179e5462868c551bddb3f4520726934386..cd9fd48367a6c5ab60571991964408273cb67848 100644
--- a/target/linux/ar71xx/profiles/compex.mk
+++ b/target/linux/ar71xx/profiles/compex.mk
@@ -11,7 +11,7 @@ define Profile/WP543
 endef
 
 define Profile/WP543/Description
-	Package set optimized for the Compex WP543
+	Package set optimized for the Compex WP543.
 endef
 
 $(eval $(call Profile,WP543))
diff --git a/target/linux/ar71xx/profiles/d-link.mk b/target/linux/ar71xx/profiles/d-link.mk
index 0aa50a640d735012a88739ba399514ad8f545e80..460900ddf6f67b553ab58e1a7a5128f57c79c699 100644
--- a/target/linux/ar71xx/profiles/d-link.mk
+++ b/target/linux/ar71xx/profiles/d-link.mk
@@ -7,7 +7,7 @@
 
 define Profile/DIR615C1
 	NAME:=D-Link DIR-615 rev. C1
-	PACKAGES:=kmod-ath9k
+	PACKAGES:=kmod-ath9k hostapd-mini
 endef
 
 define Profile/DIR615C1/Description
diff --git a/target/linux/ar71xx/profiles/planex.mk b/target/linux/ar71xx/profiles/planex.mk
index df92b1670efc2169263dc143adbfb6f8f042eab1..ec20d893f56f0a5b42ebf5e48f628f66c020435c 100644
--- a/target/linux/ar71xx/profiles/planex.mk
+++ b/target/linux/ar71xx/profiles/planex.mk
@@ -7,7 +7,7 @@
 
 define Profile/MZKW04NU
 	NAME:=Planex MZK-W04NU
-	PACKAGES:=kmod-ath9k kmod-usb-ohci kmod-usb2
+	PACKAGES:=kmod-ath9k hostapd-mini kmod-usb-ohci kmod-usb2
 endef
 
 define Profile/MZKW04NU/Description
diff --git a/target/linux/ar71xx/profiles/tp-link.mk b/target/linux/ar71xx/profiles/tp-link.mk
index db60e1d1f7759425405cbe6fc219116b35921fb0..9aaae29e363a503f86c49c2a358b367eef0a9d10 100644
--- a/target/linux/ar71xx/profiles/tp-link.mk
+++ b/target/linux/ar71xx/profiles/tp-link.mk
@@ -7,7 +7,7 @@
 
 define Profile/TLWR941ND
 	NAME:=TP-LINK TL-WR941ND
-	PACKAGES:=kmod-ath9k
+	PACKAGES:=kmod-ath9k hostapd-mini
 endef
 
 define Profile/TLWR941ND/Description
diff --git a/target/linux/ar71xx/profiles/trendnet.mk b/target/linux/ar71xx/profiles/trendnet.mk
index 3a40fbcaee7b482383ddf47936404f2aa35e4e29..22dfe9009a44840dd50370c7fee392426698d686 100644
--- a/target/linux/ar71xx/profiles/trendnet.mk
+++ b/target/linux/ar71xx/profiles/trendnet.mk
@@ -7,7 +7,7 @@
 
 define Profile/TEW632BRP
 	NAME:=TRENDNet TEW-632BRP
-	PACKAGES:=kmod-ath9k
+	PACKAGES:=kmod-ath9k hostapd-mini
 endef
 
 define Profile/TEW632BRP/Description
diff --git a/target/linux/ar71xx/profiles/ubnt.mk b/target/linux/ar71xx/profiles/ubnt.mk
index e7b20deaa0cea5542b846829372b9afd672123ee..ac9ef3619db4c2a1596dc2d6088c4faf1ff65c88 100644
--- a/target/linux/ar71xx/profiles/ubnt.mk
+++ b/target/linux/ar71xx/profiles/ubnt.mk
@@ -11,7 +11,7 @@ define Profile/UBNTRS
 endef
 
 define Profile/UBNTRS/Description
-	Package set optimized for the Ubiquiti RouterStation
+	Package set optimized for the Ubiquiti RouterStation.
 endef
 
 $(eval $(call Profile,UBNTRS))