diff --git a/network/madwifi-tools/madwifi-tools.SlackBuild b/network/madwifi-tools/madwifi-tools.SlackBuild
index 4866c85150..7d0813ba6e 100644
--- a/network/madwifi-tools/madwifi-tools.SlackBuild
+++ b/network/madwifi-tools/madwifi-tools.SlackBuild
@@ -3,7 +3,7 @@
 ## Slackware build script for madwifi-tools
 
 ## Written by hollywoodb (hollywoodb@fastmail.fm)
-## Modified by Larry Hajali <larryhaja[at]gmail[dot]com>
+## Maintained by Larry Hajali <larryhaja[at]gmail[dot]com> 9/25/09
 
 PRGNAM=madwifi
 VERSION=0.9.4
@@ -18,6 +18,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=${PKG:-$TMP/package-$PKG_NAME}
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -30,7 +38,7 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 sed -i 's|/usr/local|/usr|g' tools/Makefile
-make tools
+make CFLAGS="$SLKCFLAGS" tools
 make install-tools DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | \
@@ -48,4 +56,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PKG_NAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PKG_NAME-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/madwifi-tools/madwifi-tools.info b/network/madwifi-tools/madwifi-tools.info
index 78ebb300d3..3744cbf443 100644
--- a/network/madwifi-tools/madwifi-tools.info
+++ b/network/madwifi-tools/madwifi-tools.info
@@ -1,8 +1,10 @@
 PRGNAM="madwifi-tools"
 VERSION="0.9.4"
-HOMEPAGE="http://madwifi.org/"
+HOMEPAGE="http://madwifi-project.org/"
 DOWNLOAD="http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz"
 MD5SUM="399d20de8d855a59f20058857c2178ad"
-MAINTAINER="Nobody"
-EMAIL="nobody@nowhere"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Larry Hajali"
+EMAIL="larryhaja[at]gmail[dot]com"
 APPROVED="rworkman"
diff --git a/network/madwifi-tools/slack-desc b/network/madwifi-tools/slack-desc
index 442097945f..003ae3834b 100644
--- a/network/madwifi-tools/slack-desc
+++ b/network/madwifi-tools/slack-desc
@@ -12,8 +12,8 @@ madwifi-tools: This package includes the madwifi tools for the madwifi driver fo
 madwifi-tools: Atheros chipsets.  The kernel module itself must be built seperately.
 madwifi-tools: 
 madwifi-tools: Homepage: http://madwifi.org/
-madwifi-tools: 
-madwifi-tools: 
-madwifi-tools: 
-madwifi-tools: 
-madwifi-tools: 
+madwifi-tools:
+madwifi-tools:
+madwifi-tools:
+madwifi-tools:
+madwifi-tools: