diff --git a/srcpkgs/wireless_tools/template b/srcpkgs/wireless_tools/template
index e5a6c9f7663..d5e3f5a66c2 100644
--- a/srcpkgs/wireless_tools/template
+++ b/srcpkgs/wireless_tools/template
@@ -3,20 +3,28 @@ pkgname=wireless_tools
 version=29
 revision=4
 wrksrc="${pkgname}.${version}"
-distfiles="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$pkgname.$version.tar.gz"
-build_style=gnu-makefile
-make_install_target="INSTALL_DIR=$XBPS_DESTDIR/$pkgname-$version/usr/sbin
-INSTALL_LIB=$XBPS_DESTDIR/$pkgname-$version/usr/lib
-INSTALL_INC=$XBPS_DESTDIR/$pkgname-$version/usr/include
-INSTALL_MAN=$XBPS_DESTDIR/$pkgname-$version/usr/share/man install"
 short_desc="Set of tools allowing to manipulate the Wireless Extensions"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+license="GPL-2"
+distfiles="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$pkgname.$version.tar.gz"
 checksum=6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1
-long_desc="
- The Wireless Tools (WT) is a set of tools allowing to manipulate the
- Wireless Extensions. They use a textual interface and are rather crude,
- but aim to support the full Wireless Extension. There are many other tools
- you can use with Wireless Extensions, however Wireless Tools is the
- reference implementation."
-
 subpackages="$pkgname-devel"
+
+do_build() {
+	sed -e "s|CFLAGS=|CFLAGS+=|g" -i Makefile
+
+	if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+		make CC="$XBPS_CROSS_TRIPLET-gcc" LD="$XBPS_CROSS_TRIPLET-ld" \
+			AR="$XBPS_CROSS_TRIPLET-ar" \
+			RANLIB="$XBPS_CROSS_TRIPLET-ranlib" ${makejobs}
+	else
+		make ${makejobs}
+	fi
+}
+
+do_install() {
+	make INSTALL_DIR=${DESTDIR}/usr/sbin INSTALL_LIB=${DESTDIR}/usr/lib \
+		INSTALL_INC=${DESTDIR}/usr/include \
+		INSTALL_MAN=${DESTDIR}/usr/share/man install
+}
diff --git a/srcpkgs/wireless_tools/wireless_tools-devel.template b/srcpkgs/wireless_tools/wireless_tools-devel.template
index 8171455e529..e9c195f138e 100644
--- a/srcpkgs/wireless_tools/wireless_tools-devel.template
+++ b/srcpkgs/wireless_tools/wireless_tools-devel.template
@@ -1,15 +1,9 @@
 # Template file for 'wireless_tools-devel'.
 #
-depends="glibc-devel wireless_tools"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
+depends="wireless_tools>=${version}"
+short_desc="${short_desc} -- development files"
+noarch=yes
 
- This package contains files for development, headers, static libs, etc."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+do_install() {
+	vmove usr/include usr
 }