diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant.tmpfiles.d b/srcpkgs/wpa_supplicant/files/wpa_supplicant.tmpfiles.d
new file mode 100644
index 00000000000..01fc5dbaeff
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant.tmpfiles.d
@@ -0,0 +1 @@
+d	/var/run/wpa_supplicant	0755	root	wheel	-
diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant@.service b/srcpkgs/wpa_supplicant/files/wpa_supplicant@.service
new file mode 100644
index 00000000000..0fd77eb2cd0
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Wi-Fi Security Service on %I
+After=syslog.target
+
+[Service]
+ExecStart=/usr/sbin/wpa_supplicant -Dwext -i %I -c /etc/wpa_supplicant.conf
+
+[Install]
+Alias=multi-user.target.wants/wpa_supplicant@wlan0.service
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index ae0666333fc..bd0c0a88379 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=0.7.3
-revision=5
+revision=6
 wrksrc=${pkgname}-${version}/${pkgname}
 distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
@@ -23,24 +23,25 @@ long_desc="
 conf_files="/etc/${pkgname}.conf"
 systemd_services="${pkgname}.service on"
 
-
 Add_dependency build libnl-devel
 Add_dependency build openssl-devel
 Add_dependency build dbus-devel
 Add_dependency build readline-devel
 
-do_build()
-{
+do_build() {
 	sed -i 's|/usr/local|$(PREFIX)|g' ${wrksrc}/Makefile
 	cp -f ${FILESDIR}/config ${wrksrc}/.config
 	make ${makejobs}
 }
 
-do_install()
-{
+do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} install
 
 	vinstall ${FILESDIR}/${pkgname}.service 644 lib/systemd/system
+	vinstall ${FILESDIR}/${pkgname}@.service 644 lib/systemd/system
+	vinstall ${FILESDIR}/${pkgname}.tmpfiles.d \
+		644 usr/lib/tmpfiles.d ${pkgname}.conf
+
 	vinstall wpa_supplicant.conf 644 etc
 	for d in 5 8; do
 		install -d ${DESTDIR}/usr/share/man/man${d}
@@ -52,7 +53,6 @@ do_install()
 	sed -i -e "s|/sbin|/usr/sbin|" dbus/*.service
 	install -m644 dbus/*.service \
 		${DESTDIR}/usr/share/dbus-1/system-services/
-	install -d ${DESTDIR}/etc/dbus-1/system.d
-	install -m644 dbus/dbus-wpa_supplicant.conf \
-		${DESTDIR}/etc/dbus-1/system.d/wpa_supplicant.conf
+	vinstall dbus/dbus-${pkgname}.conf 644 \
+		etc/dbus-1/system.d ${pkgname}.conf
 }