diff --git a/contrib/init/upstart/docker.conf b/contrib/init/upstart/docker.conf
index 5e8df6e3c2..52721312dd 100644
--- a/contrib/init/upstart/docker.conf
+++ b/contrib/init/upstart/docker.conf
@@ -7,6 +7,8 @@ limit nproc 524288 1048576
 
 respawn
 
+kill timeout 20
+
 pre-start script
 	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
 	if grep -v '^#' /etc/fstab | grep -q cgroup \