diff --git a/install/onionr b/install/onionr
index c50335fa..191c89d6 100755
--- a/install/onionr
+++ b/install/onionr
@@ -1,23 +1,16 @@
 #!/bin/sh
-
 set -e
 
-export OUTPUT_DIR=${OUTPUT_DIR:=/usr/share/onionr}
-
-if [ -n "$HOME" ]; then
-    export XDG_DATA_HOME=${XDG_DATA_HOME:=$HOME/.local/share/onionr}
-
-    export ONIONR_HOME=${ONIONR_HOME:=$XDG_DATA_HOME}
-    export LOG_DIR=${LOG_DIR:=$XDG_DATA_HOME/logs}
+if [[ $EUID -eq 0 ]]; then
+    export ONIONR_HOME=${ONIONR_HOME:-/var/lib/onionr}
+    export LOG_DIR=${LOG_DIR:-/var/log/onionr}
 else
-    export ONIONR_HOME=${ONIONR_HOME:=/etc/onionr}
-    export LOG_DIR=${LOG_DIR:=/var/log/onionr}
+    export ONIONR_HOME=${ONIONR_HOME:-${XDG_DATA_HOME:-$HOME/.local/share}/onionr}
+    export LOG_DIR=${LOG_DIR:-$ONIONR_HOME/logs}
 fi
 
 mkdir -p "$ONIONR_HOME" "$LOG_DIR"
 
-chmod -R 700 "$ONIONR_HOME" "$LOG_DIR"
-chown -R $USER:$USER "$ONIONR_HOME" "$LOG_DIR"
+chmod 0700 "$ONIONR_HOME" "$LOG_DIR"
 
-cd "$OUTPUT_DIR/onionr"
-exec python3.7 onionr.py "$@"
+exec ${ONIONR_BASEDIR:-/usr/share/onionr}/onionr.sh "$@"
diff --git a/install/onionr.service b/install/onionr.service
index daaa5c05..ba2da668 100755
--- a/install/onionr.service
+++ b/install/onionr.service
@@ -1,21 +1,20 @@
 [Unit]
 Description=Onionr Daemon
 Documentation=https://onionr.net/docs/
-After=network.target tor.service
-Requires=network.target tor.service systemd-networkd-wait-online.service
+After=network-online.target
+Requires=network-online.target
 
 [Service]
-Environment="DATA_DIR=/usr/share/onionr"
-Environment="LOG_DIR=/var/log/onionr/"
+Environment="ONIONR_HOME=/var/lib/onionr"
+Environment="LOG_DIR=/var/log/onionr"
 
-ExecStart=/usr/bin/onionr --start
-ExecStop=/usr/bin/onionr --stop
+ExecStart=/usr/bin/onionr start
+ExecStop=/usr/bin/onionr stop
 
 KillMode=mixed
 KillSignal=SIGQUIT
-TimeoutStopSec=5s
-Type=simple
+TimeoutStopSec=30s
 Restart=on-abnormal
 
 [Install]
-WantedBy=tor.service
+WantedBy=multi-user.target