diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index 89e6fe0f1ca..90924467b1a 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.0
-revision=1
+revision=2
 build_wrksrc=$pkgname
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -47,12 +47,15 @@ do_install() {
 
 	vmkdir usr/lib/systemd/system
 	install -m644 systemd/*.service ${DESTDIR}/usr/lib/systemd/system
+
+	# Fix wpa_supplicant@.service to respect instance name.
+	sed -e 's,wpa_supplicant@wlan0.service,wpa_supplicant@%i.service,' -i \
+		${DESTDIR}/usr/lib/systemd/system/wpa_supplicant@.service
 }
 
 wpa_supplicant_package() {
 	conf_files="/etc/wpa_supplicant.conf"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }