diff --git a/srcpkgs/wireguard-tools/files/wireguard/finish b/srcpkgs/wireguard-tools/files/wireguard/finish
new file mode 100755
index 00000000000..619f76941e3
--- /dev/null
+++ b/srcpkgs/wireguard-tools/files/wireguard/finish
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+for conf in /etc/wireguard/*.conf; do
+	[ -e "$conf" ] || continue;
+	wg-quick down "$conf"
+done
diff --git a/srcpkgs/wireguard-tools/files/wireguard/run b/srcpkgs/wireguard-tools/files/wireguard/run
new file mode 100755
index 00000000000..d669d955aaf
--- /dev/null
+++ b/srcpkgs/wireguard-tools/files/wireguard/run
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+for conf in /etc/wireguard/*.conf; do
+	[ -e "$conf" ] || continue;
+	wg-quick up "$conf"
+done
+
+exec chpst -b wireguard pause
diff --git a/srcpkgs/wireguard-tools/template b/srcpkgs/wireguard-tools/template
index 47d2c254863..92e03df28b7 100644
--- a/srcpkgs/wireguard-tools/template
+++ b/srcpkgs/wireguard-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'wireguard-tools'
 pkgname=wireguard-tools
 version=1.0.20200513
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_install_args="WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes"
@@ -17,3 +17,7 @@ make_dirs="/etc/wireguard 0700 root root"
 post_extract() {
 	sed -i 's/^CFLAGS /override &/' ${build_wrksrc}/Makefile
 }
+
+post_install() {
+	vsv wireguard
+}