diff --git a/template b/template
index 27cdfa5..0f99235 100644
--- a/template
+++ b/template
@@ -26,6 +26,13 @@ do_install() {
     vmkdir /usr/share/doc/mullvad-vpn
     vmkdir /usr/share/zsh/site-functions
 
+    vmkdir /etc/sv/mullvad
+    echo '#!/bin/sh' > ${DESTDIR}/etc/sv/mullvad/run.sh
+    echo 'exec 2>&1' >> ${DESTDIR}/etc/sv/mullvad/run.sh
+    echo 'sv check dbus > /dev/null || exit 1' >> ${DESTDIR}/etc/sv/mullvad/run.sh
+    echo 'exec /usr/bin/mullvad-daemon -v --disable-stdout-timestamps' >> ${DESTDIR}/etc/sv/mullvad/run.sh
+    chmod 755 ${DESTDIR}/etc/sv/mullvad/run.sh
+
     vcopy usr/bin/* /usr/bin/
     vcopy usr/lib/systemd/system/* /usr/lib/systemd/system/
     vcopy usr/share/icons/hicolor/* /usr/share/icons/hicolor/
@@ -36,8 +43,8 @@ do_install() {
 
     vmkdir /usr/share/zsh/site-functions
 
-    mkdir -p ${DESTDIR}/opt/Mullvad\ VPN
-    cp -a ${wrksrc}/opt/Mullvad\ VPN/* ${DESTDIR}/opt/Mullvad\ VPN/
+    mkdir -p ${DESTDIR}/opt/MullvadVPN
+    cp -a ${wrksrc}/opt/MullvadVPN/* ${DESTDIR}/opt/MullvadVPN/
 }
 
 pkg_install() {