diff --git a/package/Config.in b/package/Config.in
index 6c5afedca6..648ae77baa 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -99,7 +99,7 @@ source "package/valgrind/Config.in"
 source "package/vtun/Config.in"
 source "package/wget/Config.in"
 source "package/which/Config.in"
-source "package/wtools/Config.in"
+source "package/wireless-tools/Config.in"
 source "package/zlib/Config.in"
 
 
diff --git a/package/wireless-tools/Config.in b/package/wireless-tools/Config.in
new file mode 100644
index 0000000000..6c20153a17
--- /dev/null
+++ b/package/wireless-tools/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_WIRELESS_TOOLS
+	bool "wireless tools"
+	default n
+	help
+	  A collection of tools to configure wireless lan cards.
+
+	  http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
diff --git a/package/wireless-tools/wireless-tools.mk b/package/wireless-tools/wireless-tools.mk
new file mode 100644
index 0000000000..4b23558025
--- /dev/null
+++ b/package/wireless-tools/wireless-tools.mk
@@ -0,0 +1,57 @@
+#############################################################
+#
+# wireless-tools - Wireless Tools
+#
+#############################################################
+
+# This Makefile only work with the multicall version of Wireless Tools,
+# which is available in 28-pre3 and later...
+# Jean II
+# v28.pre3 -> earliest possible
+WIRELESS_TOOLS_VER:=28
+WIRELESS_TOOLS_SUBVER:=.pre3
+
+WIRELESS_TOOLS_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
+WIRELESS_TOOLS_SOURCE:=wireless_tools.$(WIRELESS_TOOLS_VER)$(WIRELESS_TOOLS_SUBVER).tar.gz
+WIRELESS_TOOLS_BUILD_DIR=$(BUILD_DIR)/wireless_tools.$(WIRELESS_TOOLS_VER)
+
+$(DL_DIR)/$(WIRELESS_TOOLS_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(WIRELESS_TOOLS_SOURCE_URL)/$(WIRELESS_TOOLS_SOURCE)
+
+$(WIRELESS_TOOLS_BUILD_DIR)/.unpacked: $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE)
+	zcat $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	sed -i -e s:'strip':'$(STRIP)':g $(WIRELESS_TOOLS_BUILD_DIR)/Makefile
+	touch $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked
+
+$(WIRELESS_TOOLS_BUILD_DIR)/.configured: $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked
+	touch  $(WIRELESS_TOOLS_BUILD_DIR)/.configured
+
+$(WIRELESS_TOOLS_BUILD_DIR)/iwmulticall: $(WIRELESS_TOOLS_BUILD_DIR)/.configured
+	$(MAKE) -C $(WIRELESS_TOOLS_BUILD_DIR) \
+		CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
+		iwmulticall
+
+$(TARGET_DIR)/sbin/iwconfig: $(WIRELESS_TOOLS_BUILD_DIR)/iwmulticall
+	$(MAKE) -C $(WIRELESS_TOOLS_BUILD_DIR) \
+		PREFIX="$(TARGET_DIR)" \
+		CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
+		install-iwmulticall
+
+wireless-tools: $(TARGET_DIR)/sbin/iwconfig
+
+wireless-tools-source: $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE)
+
+wireless-tools-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(WIRELESS_TOOLS_BUILD_DIR) uninstall
+	-$(MAKE) -C $(WIRELESS_TOOLS_BUILD_DIR) clean
+
+wireless-tools-dirclean:
+	rm -rf $(WIRELESS_TOOLS_BUILD_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_WIRELESS_TOOLS)),y)
+TARGETS+=wireless-tools
+endif
diff --git a/package/wireless-tools/wtools.mk b/package/wireless-tools/wtools.mk
new file mode 100644
index 0000000000..4644526f43
--- /dev/null
+++ b/package/wireless-tools/wtools.mk
@@ -0,0 +1,57 @@
+#############################################################
+#
+# wtools - Wireless Tools
+#
+#############################################################
+
+# This Makefile only work with the multicall version of Wireless Tools,
+# which is available in 28-pre3 and later...
+# Jean II
+# v28.pre3 -> earliest possible
+WTOOLS_VER:=28
+WTOOLS_SUBVER:=.pre3
+
+WTOOLS_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
+WTOOLS_SOURCE:=wireless_tools.$(WTOOLS_VER)$(WTOOLS_SUBVER).tar.gz
+WTOOLS_BUILD_DIR=$(BUILD_DIR)/wireless_tools.$(WTOOLS_VER)
+
+$(DL_DIR)/$(WTOOLS_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(WTOOLS_SOURCE_URL)/$(WTOOLS_SOURCE) 
+
+$(WTOOLS_BUILD_DIR)/.unpacked: $(DL_DIR)/$(WTOOLS_SOURCE)
+	zcat $(DL_DIR)/$(WTOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	sed -i -e s:'strip':'$(STRIP)':g $(WTOOLS_BUILD_DIR)/Makefile
+	touch $(WTOOLS_BUILD_DIR)/.unpacked
+
+$(WTOOLS_BUILD_DIR)/.configured: $(WTOOLS_BUILD_DIR)/.unpacked
+	touch  $(WTOOLS_BUILD_DIR)/.configured
+
+$(WTOOLS_BUILD_DIR)/iwmulticall: $(WTOOLS_BUILD_DIR)/.configured
+	$(MAKE) -C $(WTOOLS_BUILD_DIR) \
+		CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
+		iwmulticall
+
+$(TARGET_DIR)/sbin/iwconfig: $(WTOOLS_BUILD_DIR)/iwmulticall
+	$(MAKE) -C $(WTOOLS_BUILD_DIR) \
+		PREFIX="$(TARGET_DIR)" \
+		CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
+		install-iwmulticall
+
+wtools: $(TARGET_DIR)/sbin/iwconfig 
+
+wtools-source: $(DL_DIR)/$(WTOOLS_SOURCE)
+
+wtools-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(WTOOLS_BUILD_DIR) uninstall
+	-$(MAKE) -C $(WTOOLS_BUILD_DIR) clean
+
+wtools-dirclean:
+	rm -rf $(WTOOLS_BUILD_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_WTOOLS)),y)
+TARGETS+=wtools
+endif