diff --git a/contrib/init/dashd.conf b/contrib/init/dashd.conf
index 93f7cc1206..096bcc4adc 100644
--- a/contrib/init/dashd.conf
+++ b/contrib/init/dashd.conf
@@ -16,7 +16,7 @@ expect fork
 
 respawn
 respawn limit 5 120
-kill timeout 60
+kill timeout 600
 
 pre-start script
     # this will catch non-existent config files
diff --git a/contrib/init/dashd.init b/contrib/init/dashd.init
index 0013ccfd10..7a341702ef 100644
--- a/contrib/init/dashd.init
+++ b/contrib/init/dashd.init
@@ -39,7 +39,7 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc $prog
+    killproc $prog -t600
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && rm -f $lockfile
diff --git a/contrib/init/dashd.service b/contrib/init/dashd.service
index ed384937b9..8bdb2ae207 100644
--- a/contrib/init/dashd.service
+++ b/contrib/init/dashd.service
@@ -24,6 +24,7 @@ ExecStart=/usr/bin/dashd -daemon \
 Type=forking
 PIDFile=/run/dashd/dashd.pid
 Restart=on-failure
+TimeoutStopSec=600
 
 # Directory creation and permissions
 ####################################