diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/files/kubelet.service b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/files/kubelet.service
new file mode 100644
index 0000000000..426ed02b1e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/files/kubelet.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Kubernetes Kubelet
+Documentation=https://github.com/GoogleCloudPlatform/kubernetes
+
+[Service]
+Environment=ADDRESS=127.0.0.1
+Environment=API_SERVERS=http://127.0.0.1:8080
+Environment=ALLOW_PRIVILEGED=false
+Environment=CONFIG=/etc/kubernetes/manifests
+Environment=LOGGING=2
+
+ExecStart=/usr/bin/kubelet \
+	--address=$ADDRESS \
+	--api-servers=$API_SERVERS \
+	--allow-privileged=$ALLOW_PRIVILEGED \
+	--config=$CONFIG \
+	--v=$LOGGING
+
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.0.1-r1.ebuild
similarity index 91%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.0.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.0.1-r1.ebuild
index d7f5971961..bc14103c9d 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.0.1-r1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=5
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="Kubernetes Container Manager"
 HOMEPAGE="http://kubernetes.io/"
@@ -42,4 +42,6 @@ src_compile() {
 
 src_install() {
 	dobin "${S}/_output/local/bin/linux/${ARCH}/${PN}"
+
+	systemd_dounit "${FILESDIR}/kubelet.service"
 }