diff --git a/tasks/main.yml b/tasks/main.yml
index c9b74c1c9586b91ecf65e40cbad0bd772ebfc2ab..5ed60583d21babfe09b1758d14fd2caa34355603 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -20,6 +20,8 @@
 
 # Autostart:
 # sudo update-rc.d spideroak defaults
+# --headless doesn't work for now, so it is implemented as a crontab:
+# 35 * * * * SpiderOakONE --batchmode >/dev/null 2>&1
 
 # Initial setup:
 # $ SpiderOakONE --setup=-
diff --git a/templates/etc_init_d_spideroak b/templates/etc_init_d_spideroak
index e2a8108a89d5a7581456725e02b64da68b77dcde..9588b4651956bc9db011a28f096aa4fd3cdcd258 100644
--- a/templates/etc_init_d_spideroak
+++ b/templates/etc_init_d_spideroak
@@ -28,3 +28,33 @@ case "$1" in
 esac
 
 exit $?
+
+
+
+
+
+. /etc/rc.d/init.d/functions
+
+# Check for a config file
+[ -f /etc/sysconfig/SpiderOak ] && . /etc/sysconfig/SpiderOak
+
+[ -z "$SPIDEROAKUSER" ] && SPIDEROAKUSER='bcotton'
+[ -z "$SPIDEROAKCMD" ] && SPIDEROAKCMD='/usr/bin/SpiderOak'
+
+case "$1" in
+  start)
+	for user in $SPIDEROAKUSER; do
+		runuser $user -c "$SPIDEROAKCMD --headless $SPIDEROAKOPTS &"
+		retval=$?
+		[ $? ] && echo_success || echo_failure
+	done
+	;;
+  stop)
+	kill `pidof SpiderOak` && echo "SpiderOak stopped"
+	retval=$?
+
+	[ $? ] && echo_success || echo_failure
+	;;
+  *)
+	echo "Usage: $0 {start|stop}"
+esac