diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.4.1-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd
index f4730cf8d0..722b2e3d9f 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd
@@ -11,8 +11,8 @@ parse_docker_args() {
 
         # treat --flag=foo and --flag foo identically
         if [[ "${flag}" == *=* ]]; then
-            flag="${flag%=*}"
             set -- "${flag#*=}" "$@"
+            flag="${flag%=*}"
         fi
 
         case "${flag}" in