diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index 730b819d5b..05d1ca24cc 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -65,6 +65,7 @@ source "package/fprobe-ulog/Config.in"
 source "package/freeradius/Config.in"
 source "package/frickin/Config.in"
 source "package/howl/Config.in"
+source "package/hostap-utils/Config.in"
 source "package/hostapd/Config.in"
 source "package/htpdate/Config.in"
 source "package/iproute2/Config.in"
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 5fcaa269d5..ca501c1072 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -52,6 +52,7 @@ package-$(BR2_COMPILE_GMP) += gmp
 package-$(BR2_COMPILE_GNUTLS) += gnutls
 package-$(BR2_PACKAGE_GPSD) += gpsd
 package-$(BR2_PACKAGE_HASERL) += haserl
+package-$(BR2_PACKAGE_HOSTAP_UTILS) += hostap-utils
 package-$(BR2_PACKAGE_HOSTAPD) += hostapd
 package-$(BR2_COMPILE_HOWL) += howl
 package-$(BR2_PACKAGE_HTPDATE) += htpdate
diff --git a/openwrt/package/hostap-utils/Config.in b/openwrt/package/hostap-utils/Config.in
new file mode 100644
index 0000000000..d2a9f06347
--- /dev/null
+++ b/openwrt/package/hostap-utils/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_HOSTAP_UTILS
+	prompt "hostap-utils...................... Host AP driver utility programs"
+	tristate
+	default m if CONFIG_DEVEL
+	help
+	  Host AP driver utility programs
+	  
+	  http://hostap.epitest.fi/
+
diff --git a/openwrt/package/hostap-utils/Makefile b/openwrt/package/hostap-utils/Makefile
new file mode 100644
index 0000000000..37be5d1fd1
--- /dev/null
+++ b/openwrt/package/hostap-utils/Makefile
@@ -0,0 +1,45 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=hostap-utils
+PKG_VERSION:=0.4.0
+PKG_RELEASE:=1
+PKG_MD5SUM:=c6775ca98721affeb336392def22289e
+
+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,HOSTAP_UTILS,hostap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -Wall" \
+		all
+	touch $@
+
+$(IPKG_HOSTAP_UTILS):
+	install -m0755 -d $(IDIR_HOSTAP_UTILS)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/hostap_crypt_conf $(IDIR_HOSTAP_UTILS)/usr/sbin/
+	install -m0755 $(PKG_BUILD_DIR)/hostap_diag $(IDIR_HOSTAP_UTILS)/usr/sbin/
+	install -m0755 $(PKG_BUILD_DIR)/hostap_io_debug $(IDIR_HOSTAP_UTILS)/usr/sbin/
+	install -m0755 $(PKG_BUILD_DIR)/hostap_rid $(IDIR_HOSTAP_UTILS)/usr/sbin/
+	install -m0755 $(PKG_BUILD_DIR)/prism2_srec $(IDIR_HOSTAP_UTILS)/usr/sbin/
+	install -m0755 $(PKG_BUILD_DIR)/split_combined_hex $(IDIR_HOSTAP_UTILS)/usr/sbin/
+	$(RSTRIP) $(IDIR_HOSTAP_UTILS)
+	$(IPKG_BUILD) $(IDIR_HOSTAP_UTILS) $(PACKAGE_DIR)
+
+mostlyclean:
+	-$(MAKE) -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built
+
diff --git a/openwrt/package/hostap-utils/ipkg/hostap-utils.control b/openwrt/package/hostap-utils/ipkg/hostap-utils.control
new file mode 100644
index 0000000000..c7e1270cb3
--- /dev/null
+++ b/openwrt/package/hostap-utils/ipkg/hostap-utils.control
@@ -0,0 +1,5 @@
+Package: hostap-utils
+Priority: optional
+Section: net
+Depends:
+Description: Host AP driver utility programs