diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/systemloader/systemd/start-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/systemloader/systemd/start-template
index c761d4a00..3887bcd20 100644
--- a/src/main/resources/com/typesafe/sbt/packager/archetypes/systemloader/systemd/start-template
+++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/systemloader/systemd/start-template
@@ -11,6 +11,7 @@ ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 RestartSec=${{retryTimeout}}
 SuccessExitStatus=${{SuccessExitStatus}}
+TimeoutStopSec=${{TimeoutStopSec}}
 User=${{daemon_user}}
 ExecStartPre=/bin/mkdir -p /run/${{app_name}}
 ExecStartPre=/bin/chown ${{daemon_user}}:${{daemon_group}} /run/${{app_name}}
diff --git a/src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemdPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemdPlugin.scala
index d3b05b965..36b0e3180 100644
--- a/src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemdPlugin.scala
+++ b/src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemdPlugin.scala
@@ -4,6 +4,7 @@ import sbt._
 import sbt.Keys.{sourceDirectory, target}
 import com.typesafe.sbt.packager.Keys.{
   defaultLinuxStartScriptLocation,
+  killTimeout,
   linuxMakeStartScript,
   linuxPackageMappings,
   linuxScriptReplacements,
@@ -58,7 +59,8 @@ object SystemdPlugin extends AutoPlugin {
       isConf = true
     ),
     // add additional system configurations to script replacements
-    linuxScriptReplacements += ("SuccessExitStatus" -> systemdSuccessExitStatus.value.mkString(" "))
+    linuxScriptReplacements += ("SuccessExitStatus" -> systemdSuccessExitStatus.value.mkString(" ")),
+    linuxScriptReplacements += ("TimeoutStopSec" -> killTimeout.value.toString)
   )
 
   def debianSettings: Seq[Setting[_]] = inConfig(Debian)(defaultLinuxStartScriptLocation := "/lib/systemd/system")