diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service
index ca5b4cec0e..e5fa56e2e6 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service
@@ -1,9 +1,8 @@
 [Unit]
 Description=Network fabric for containers
 Documentation=https://github.com/coreos/flannel
-Wants=etcd.service
 Requires=early-docker.service
-After=etcd.service early-docker.service
+After=etcd.service etcd2.service early-docker.service
 Before=early-docker.target
 
 [Service]
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.1-r1.ebuild