diff --git a/Makefile b/Makefile
index d3724e2ef..fb3673710 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ docker/weaveutil:
 $(SCOPE_EXPORT): $(SCOPE_EXE) $(DOCKER_DISTRIB) docker/weave docker/weaveutil $(RUNSVINIT) docker/Dockerfile docker/demo.json docker/run-app docker/run-probe docker/entrypoint.sh
 	cp $(SCOPE_EXE) $(RUNSVINIT) docker/
 	cp $(DOCKER_DISTRIB) docker/docker.tgz
-	cd docker && tar -xvzf docker.tgz
+	tar -xvzf docker/docker.tgz docker/docker
 	$(SUDO) docker build -t $(SCOPE_IMAGE) docker/
 	$(SUDO) docker tag $(SCOPE_IMAGE) $(SCOPE_IMAGE):$(IMAGE_TAG)
 	$(SUDO) docker save $(SCOPE_IMAGE):latest > $@
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 39932d47a..144be0ac6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@ LABEL works.weave.role=system
 WORKDIR /home/weave
 RUN apk add --update bash runit conntrack-tools iproute2 util-linux curl && \
 	rm -rf /var/cache/apk/*
-ADD ./docker/docker /usr/local/bin/docker
+ADD ./docker /usr/local/bin/docker
 ADD ./demo.json /
 ADD ./weave ./weaveutil /usr/bin/
 COPY ./scope ./runsvinit ./entrypoint.sh /home/weave/