diff --git a/dom0/sd-whonix-rsyslog-enable.sls b/dom0/sd-whonix-rsyslog-enable.sls
index c668a7da0..216c0338d 100644
--- a/dom0/sd-whonix-rsyslog-enable.sls
+++ b/dom0/sd-whonix-rsyslog-enable.sls
@@ -37,7 +37,9 @@ sd-rc-enable-logging:
             ln -sf /rw/config/sdlog.conf /etc/rsyslog.d/sdlog.conf
         fi
         systemctl restart rsyslog
+        # Munge torrc file and restart tor on boot instead of upstream's anon-connection-wizard
+        # see https://forums.whonix.org/t/configuring-onion-service/9042/37
+        sudo sed -i 's,^\%include /etc/torrc.d/95_whonix.conf,,' /etc/tor/torrc
+        sudo service tor restart
   cmd.run:
-    - name: ln -sf /rw/config/sd-rsyslog.conf /etc/sd-rsyslog.conf && systemctl restart rsyslog
-
-
+    - name: /rw/config/rc.local