diff --git a/deb/service-build.sh b/deb/service-build.sh
index b0daa45..7eda4d7 100644
--- a/deb/service-build.sh
+++ b/deb/service-build.sh
@@ -65,7 +65,8 @@ echo "PermissionsStartOnly=true"                                >> service-${NAM
 echo "ExecStartPre=setcap 'cap_net_bind_service=+ep' ${RUNNER}" >> service-${NAME}
 echo "ExecStart=${RUNNER} ${EXEARGUMENTS}"                      >> service-${NAME}
 echo "KillMode=control-group"                                   >> service-${NAME}
-echo "TimeoutStopSec=5"                                         >> service-${NAME}
+echo "KillSignal=SIGINT"                                        >> service-${NAME}
+echo "TimeoutStopSec=30"                                        >> service-${NAME}
 echo "Restart=on-failure"                                       >> service-${NAME}
 if [[ -n "${LOGOUTPUT}" ]]; then
   echo "StandardOutput=${LOGOUTPUT}"                            >> service-${NAME}