diff --git a/src/main/scala/mesosphere/mesos/TaskGroupBuilder.scala b/src/main/scala/mesosphere/mesos/TaskGroupBuilder.scala
index e8a1dc0d61e..d04aeb65396 100644
--- a/src/main/scala/mesosphere/mesos/TaskGroupBuilder.scala
+++ b/src/main/scala/mesosphere/mesos/TaskGroupBuilder.scala
@@ -11,8 +11,10 @@ import mesosphere.marathon.raml.Endpoint
 import mesosphere.marathon.state.{ EnvVarString, PathId, PortAssignment, Timestamp }
 import mesosphere.marathon.stream._
 import mesosphere.marathon.tasks.PortsMatch
+import org.apache.mesos.Protos.{ DurationInfo, KillPolicy }
 import org.apache.mesos.{ Protos => mesos }
 
+import java.util.concurrent.TimeUnit.SECONDS
 import scala.collection.immutable.Seq
 
 object TaskGroupBuilder extends StrictLogging {
@@ -156,6 +158,15 @@ object TaskGroupBuilder extends StrictLogging {
       builder.setHealthCheck(computeHealthCheck(healthCheck, portAssignments))
     }
 
+    for {
+      lc <- container.lifecycle
+      killGracePeriodSeconds <- lc.killGracePeriodSeconds
+    } {
+      val durationInfo = DurationInfo.newBuilder.setNanoseconds((killGracePeriodSeconds * SECONDS.toNanos(1)).toLong)
+      builder.setKillPolicy(
+        KillPolicy.newBuilder.setGracePeriod(durationInfo))
+    }
+
     builder
   }
 
diff --git a/src/test/scala/mesosphere/mesos/TaskGroupBuilderTest.scala b/src/test/scala/mesosphere/mesos/TaskGroupBuilderTest.scala
index 375c011addc..e84c35b85d7 100644
--- a/src/test/scala/mesosphere/mesos/TaskGroupBuilderTest.scala
+++ b/src/test/scala/mesosphere/mesos/TaskGroupBuilderTest.scala
@@ -7,19 +7,25 @@ import mesosphere.marathon.core.pod._
 import mesosphere.marathon.core.task.Task
 import mesosphere.marathon.plugin.task.RunSpecTaskProcessor
 import mesosphere.marathon.plugin.{ ApplicationSpec, PodSpec }
-import mesosphere.marathon.raml
-import mesosphere.marathon.raml.Resources
+import mesosphere.marathon.{ AllConf, raml }
+import mesosphere.marathon.raml.{ Lifecycle, Resources }
 import mesosphere.marathon.state.PathId._
-import mesosphere.marathon.state.{ Command, EnvVarString, ResourceRole }
+import mesosphere.marathon.state._
 import mesosphere.marathon.stream._
-import mesosphere.marathon.test.MarathonTestHelper
+import mesosphere.marathon.test.{ MarathonTestHelper, SettableClock }
 import org.apache.mesos.Protos.{ ExecutorInfo, TaskGroupInfo, TaskInfo }
 import org.apache.mesos.{ Protos => mesos }
+import org.scalatest.Inside
 
 import scala.collection.immutable.Seq
 import scala.collection.breakOut
+import scala.concurrent.duration._
+
+class TaskGroupBuilderTest extends UnitTest with Inside {
+
+  implicit val clock = new SettableClock()
+  val config = AllConf.withTestConfig()
 
-class TaskGroupBuilderTest extends UnitTest {
   val defaultBuilderConfig = TaskGroupBuilder.BuilderConfig(
     acceptedResourceRoles = Set(ResourceRole.Unreserved),
     envVarsPrefix = None)
@@ -887,5 +893,27 @@ class TaskGroupBuilderTest extends UnitTest {
       taskGroupInfo.getTasksCount should be(1)
       taskGroupInfo.getTasks(0).getName should be(s"${container.name}-extended")
     }
+
+    "killPolicy is specified correctly" in {
+      val killDuration = 3.seconds
+      val offer = MarathonTestHelper.makeBasicOffer(cpus = 3.1, mem = 416.0, disk = 10.0, beginPort = 8000, endPort = 9000).build
+      val container = MesosContainer(
+        name = "withTTY",
+        resources = Resources(),
+        lifecycle = Some(Lifecycle(Some(killDuration.toSeconds.toDouble))))
+
+      val podSpec = PodDefinition(id = PathId("/tty"), containers = Seq(container))
+      val resourceMatch = RunSpecOfferMatcher.matchOffer(podSpec, offer, Seq.empty, defaultBuilderConfig.acceptedResourceRoles)
+      val (_, taskGroupInfo, _, _) = TaskGroupBuilder.build(
+        podSpec,
+        offer,
+        s => Instance.Id.forRunSpec(s),
+        defaultBuilderConfig,
+        RunSpecTaskProcessor.empty,
+        resourceMatch.asInstanceOf[ResourceMatchResponse.Match].resourceMatch
+      )
+
+      taskGroupInfo.getTasks(0).getKillPolicy.getGracePeriod.getNanoseconds shouldBe (killDuration.toNanos)
+    }
   }
 }