diff --git a/docker/s6/crond/down b/docker/s6/crond/down
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docker/s6/crond/run b/docker/s6/crond/run
new file mode 100755
index 00000000000..9aa9fb9f275
--- /dev/null
+++ b/docker/s6/crond/run
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Crontabs are located by default in /var/spool/cron/crontabs/
+# The default configuration is also calling all the scripts in /etc/periodic/${period}
+
+if test -f ./setup; then
+    source ./setup
+fi
+
+exec gosu root /usr/sbin/crond -fS
diff --git a/docker/start.sh b/docker/start.sh
index 042bdd05d5c..a54c2a9bfd6 100755
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -48,6 +48,15 @@ else
     create_socat_links
 fi
 
+CROND=$(echo "$RUN_CROND" | tr '[:upper:]' '[:lower:]')
+if [ "$CROND" = "true" -o "$CROND" = "1" ]; then
+    echo "init:crond  | Cron Daemon (crond) will be run as requested by s6" 1>&2
+    rm -f /app/gogs/docker/s6/crond/down
+else
+    # Tell s6 not to run the crond service
+    touch /app/gogs/docker/s6/crond/down
+fi
+
 # Exec CMD or S6 by default if nothing present
 if [ $# -gt 0 ];then
     exec "$@"