diff --git a/openwrt/package/hostap/Makefile b/openwrt/package/hostap/Makefile
new file mode 100644
index 0000000000..b546c0b255
--- /dev/null
+++ b/openwrt/package/hostap/Makefile
@@ -0,0 +1,92 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+include $(TOPDIR)/package/kernel.mk
+
+PKG_NAME:=hostap-driver
+PKG_VERSION:=0.4.9
+PKG_RELEASE:=1
+PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378
+
+PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+define Package/kmod-hostap
+ SECTION:=drivers
+ CATEGORY:=Drivers
+ DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_4_X86
+ TITLE:=Host AP support for Prism2/2.5/3 IEEE 802.11b
+ DESCRIPTION:=Host AP support for Prism2/2.5/3 IEEE 802.11b \\\
+A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3 \\\
+chipset. This driver supports so called Host AP mode that allows the card \\\
+to act as an IEEE 802.11 access point. \\\
+\\\
+This option includes the base Host AP driver code that is shared by \\\
+different hardware models. You will also need to enable support for \\\
+PLX/PCI/CS version of the driver to actually use the driver. \\\
+ URL:=http://hostap.epitest.fi/
+ VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+endef
+
+define Package/kmod-hostap-pci
+ SECTION:=drivers
+ CATEGORY:=Drivers
+ DEPENDS:=kmod-hostap
+ TITLE:=Host AP driver for Prism2.5 PCI adaptors
+ DESCRIPTION:=Host AP driver for Prism2.5 PCI adaptors
+ URL:=http://hostap.epitest.fi/
+ VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+endef
+
+define Package/kmod-hostap-plx
+ SECTION:=drivers
+ CATEGORY:=Drivers
+ DEPENDS:=kmod-hostap
+ TITLE:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors
+ DESCRIPTION:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors
+ URL:=http://hostap.epitest.fi/
+ VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+endef
+
+
+define Build/Compile
+	$(MAKE) -C $(LINUX_DIR)/ \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		SUBDIRS="$(PKG_BUILD_DIR)/driver/modules" \
+		modules
+endef
+
+define Package/kmod-hostap/install
+	install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
+	$(CP) \
+		$(PKG_BUILD_DIR)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \
+		$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \
+		$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
+		$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_wep.$(LINUX_KMOD_SUFFIX) \
+		$(1)/lib/modules/$(LINUX_VERSION)/
+endef
+
+define Package/kmod-hostap-pci/install
+	install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
+	$(CP) \
+		$(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX) \
+		$(1)/lib/modules/$(LINUX_VERSION)/
+endef
+
+define Package/kmod-hostap-plx/install
+	install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
+	$(CP) \
+		$(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \
+		$(1)/lib/modules/$(LINUX_VERSION)/
+endef
+
+$(eval $(call BuildPackage,kmod-hostap))
+$(eval $(call BuildPackage,kmod-hostap-pci))
+$(eval $(call BuildPackage,kmod-hostap-plx))
diff --git a/openwrt/target/linux/package/hostap/Config.in b/openwrt/target/linux/package/hostap/Config.in
deleted file mode 100644
index 39b49d4c4b..0000000000
--- a/openwrt/target/linux/package/hostap/Config.in
+++ /dev/null
@@ -1,40 +0,0 @@
-config PACKAGE_KMOD_HOSTAP
-	prompt "kmod-hostap....................... Host AP support for Prism2/2.5/3 IEEE 802.11b"
-	tristate
-	depends LINUX_2_4_X86 || LINUX_2_4_BRCM
-	default m if DEVEL
-	help
-	  A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3
-	  chipset. This driver supports so called Host AP mode that allows
-	  the card to act as an IEEE 802.11 access point.
-	  
-	  This option includes the base Host AP driver code that is shared by
-	  different hardware models. You will also need to enable support for
-	  PLX/PCI/CS version of the driver to actually use the driver.
-	  
-	  http://hostap.epitest.fi/
-
-config PACKAGE_KMOD_HOSTAP_PCI
-	prompt   "kmod-hostap-pci................. Host AP driver for Prism2.5 PCI adaptors"
-	tristate
-	default m if DEVEL
-	depends PACKAGE_KMOD_HOSTAP
-	help
-	  Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
-	  driver and its help text includes more information about the Host AP
-	  driver.
-	  
-	  http://hostap.epitest.fi/
-
-config PACKAGE_KMOD_HOSTAP_PLX
-	prompt   "kmod-hostap-plx................. Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors"
-	tristate
-	default m if DEVEL
-	depends PACKAGE_KMOD_HOSTAP
-	help
-	  Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
-	  driver and its help text includes more information about the Host AP
-	  driver.
-	  
-	  http://hostap.epitest.fi/
-
diff --git a/openwrt/target/linux/package/hostap/Makefile b/openwrt/target/linux/package/hostap/Makefile
deleted file mode 100644
index 3e8e604984..0000000000
--- a/openwrt/target/linux/package/hostap/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id$
-
-include $(TOPDIR)/rules.mk
-include ../../rules.mk
-
-PKG_NAME:=hostap-driver
-PKG_VERSION:=0.4.7
-PKG_RELEASE:=1
-PKG_MD5SUM:=ee495686cf27011b4e401963c2c7f62a
-
-PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,KMOD_HOSTAP,kmod-hostap,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
-$(eval $(call PKG_template,KMOD_HOSTAP_PCI,kmod-hostap-pci,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
-$(eval $(call PKG_template,KMOD_HOSTAP_PLX,kmod-hostap-plx,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built: 
-	$(MAKE) -C $(LINUX_DIR)/ \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		SUBDIRS="$(PKG_BUILD_DIR)/driver/modules" \
-		modules
-	touch $@
-
-$(IPKG_KMOD_HOSTAP):
-	install -m0755 -d $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION)
-	$(CP) \
-		$(PKG_BUILD_DIR)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \
-		$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \
-		$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
-		$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_wep.$(LINUX_KMOD_SUFFIX) \
-		$(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION)/
-	$(IPKG_BUILD) $(IDIR_KMOD_HOSTAP) $(PACKAGE_DIR)
-
-$(IPKG_KMOD_HOSTAP_PCI):
-	install -m0755 -d $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)
-	$(CP) \
-		$(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX) \
-		$(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)/
-	$(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PCI) $(PACKAGE_DIR)
-
-$(IPKG_KMOD_HOSTAP_PLX):
-	install -m0755 -d $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)
-	$(CP) \
-		$(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \
-		$(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)/
-	$(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PLX) $(PACKAGE_DIR)
-
diff --git a/openwrt/target/linux/package/hostap/ipkg/kmod-hostap-pci.control b/openwrt/target/linux/package/hostap/ipkg/kmod-hostap-pci.control
deleted file mode 100644
index 3c3cdf8256..0000000000
--- a/openwrt/target/linux/package/hostap/ipkg/kmod-hostap-pci.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: kmod-hostap-pci
-Priority: optional
-Section: net
-Depends: kmod-hostap
-Description: Host AP driver for Prism2.5 PCI adaptors
diff --git a/openwrt/target/linux/package/hostap/ipkg/kmod-hostap-plx.control b/openwrt/target/linux/package/hostap/ipkg/kmod-hostap-plx.control
deleted file mode 100644
index 6e039b8345..0000000000
--- a/openwrt/target/linux/package/hostap/ipkg/kmod-hostap-plx.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: kmod-hostap-plx
-Priority: optional
-Section: net
-Depends: kmod-hostap
-Description: Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors
diff --git a/openwrt/target/linux/package/hostap/ipkg/kmod-hostap.control b/openwrt/target/linux/package/hostap/ipkg/kmod-hostap.control
deleted file mode 100644
index e5efb4e7f9..0000000000
--- a/openwrt/target/linux/package/hostap/ipkg/kmod-hostap.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: kmod-hostap
-Priority: optional
-Section: net
-Description: Host AP support for Prism2/2.5/3 IEEE 802.11b