diff --git a/srcpkgs/wpa_supplicant/files/config b/srcpkgs/wpa_supplicant/files/config
index 0428ea15204..b1f749ebaec 100644
--- a/srcpkgs/wpa_supplicant/files/config
+++ b/srcpkgs/wpa_supplicant/files/config
@@ -468,7 +468,7 @@ CONFIG_NO_RANDOM_POOL=y
 #CONFIG_HS20=y
 
 # Enable interface matching in wpa_supplicant
-#CONFIG_MATCH_IFACE=y
+CONFIG_MATCH_IFACE=y
 
 # Disable roaming in wpa_supplicant
 #CONFIG_NO_ROAMING=y
diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run
old mode 100755
new mode 100644
index 2a9f965455f..93294c55d8d
--- a/srcpkgs/wpa_supplicant/files/wpa_supplicant/run
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
 exec 2>&1
-exec wpa_supplicant -c ${CONF_FILE:=/etc/wpa_supplicant/wpa_supplicant.conf} -i ${WPA_INTERFACE:=wlan0} ${OPTS:=-s}
+exec wpa_supplicant -M -c ${CONF_FILE:-/etc/wpa_supplicant/wpa_supplicant.conf} ${WPA_INTERFACE:+-i ${WPA_INTERFACE}} ${OPTS:--s}
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index eba3536c9ef..317522fdb40 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -2,7 +2,7 @@
 pkgname=wpa_supplicant
 reverts="2.7_1"
 version=2.6
-revision=13
+revision=14
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
@@ -18,7 +18,7 @@ build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 
 pre_build() {
-	sed -i 's|/usr/local|$(PREFIX)|g' Makefile
+	vsed -e 's|/usr/local|$(PREFIX)|g' -i Makefile
 	cp -f ${FILESDIR}/config .config
 
 	if [ "$build_option_dbus" ]; then