diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant.rc b/srcpkgs/wpa_supplicant/files/wpa_supplicant.rc
index 274ada69582..44e892f9cce 100644
--- a/srcpkgs/wpa_supplicant/files/wpa_supplicant.rc
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant.rc
@@ -6,7 +6,7 @@ command=/usr/sbin/wpa_supplicant
 : ${wpa_supplicant_conf:=/etc/wpa_supplicant.conf}
 : ${wpa_supplicant_log:=/var/log/wpa_supplicant.log}
 wpa_supplicant_if=${wpa_supplicant_if:+-i}$wpa_supplicant_if
-command_args="$wpa_supplicant_args -f $wpa_supplicant_log -B -c $wpa_supplicant_conf $wpa_supplicant_if"
+command_args="$wpa_supplicant_args -f $wpa_supplicant_log -B -c$wpa_supplicant_conf $wpa_supplicant_if"
 name="WPA Supplicant Daemon"
 
 depend()
@@ -15,7 +15,7 @@ depend()
 	use logger
 	after bootmisc modules
 	before dns dhcpcd net
-	keyword noshutdown
+	keyword -shutdown
 }
 
 find_wireless()
@@ -25,7 +25,9 @@ find_wireless()
 	case "$RC_UNAME" in
 	Linux)
 		for iface in /sys/class/net/*; do
-			if [ -e "$iface"/wireless ]; then
+			if [ -e "$iface"/wireless -o \
+				-e "$iface"/phy80211 ]
+			then
 				echo "${iface##*/}"
 				return 0
 			fi
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index 399480c24ba..2bbf8104e92 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,6 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
-version=0.6.9
-revision=1
+version=0.7.0
 wrksrc=${pkgname}-${version}/${pkgname}
 distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz"
 build_style=gnu_makefile
@@ -9,7 +8,7 @@ make_install_target="PREFIX=/usr
  DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version} install"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6e5284fa3f7c56e001fae92486eaa31340db5dd925dcb38bd572d2e8ed70f570
+checksum=9d34f678881b21eb685b730bfed2dc56f4c9eb50bf79245c246f0b8266b75e21
 long_desc="
  $pkgname is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with
  support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both
@@ -35,7 +34,7 @@ Add_dependency build dbus
 Add_dependency run ncurses-libs
 Add_dependency run dbus-libs
 
-pre_configure()
+pre_build()
 {
 	sed -i 's|/usr/local|$(PREFIX)|g' ${wrksrc}/Makefile
 	cp -f ${FILESDIR}/config ${wrksrc}/.config