diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf b/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
new file mode 100644
index 0000000000..ffec7f0b06
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
@@ -0,0 +1,3 @@
+WPA_INTERFACE=wlan0
+# Log to syslog by default
+OPTS="-s"
diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
new file mode 100755
index 0000000000..5cd1491329
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+install -d -m0750 -o root -g wheel /var/log/wpa_supplicant
+echo "Logging to /var/log/wpa_supplicant/current"
+exec chpst -u root:daemon svlogd -t /var/log/wpa_supplicant
diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run
new file mode 100755
index 0000000000..82f3c6479a
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+: ${WPA_INTERFACE:=wlan0}
+exec 2>&1
+exec wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -i ${WPA_INTERFACE} ${OPTS}
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index 918ec830b5..22cc79a10f 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.4
-revision=1
+revision=2
 build_wrksrc=$pkgname
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,7 +13,7 @@ checksum=058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122
 build_pie=yes
 hostmakedepends="pkg-config"
 makedepends="libnl3-devel libressl-devel>=2.1.4 dbus-devel readline-devel>=6.3"
-conf_files="/etc/${pkgname}/${pkgname}.conf"
+conf_files="/etc/sv/wpa_supplicant/conf /etc/sv/wpa_supplicant/log/run /etc/${pkgname}/${pkgname}.conf"
 build_options="systemd"
 
 pre_build() {
@@ -54,4 +54,5 @@ do_install() {
 	fi
 
 	vlicense README
+	vsv wpa_supplicant
 }