diff --git a/dns/Dockerfile b/dns/Dockerfile
index b4feddc1..181bcbbc 100644
--- a/dns/Dockerfile
+++ b/dns/Dockerfile
@@ -1,3 +1,5 @@
-FROM ubuntu
-EXPOSE 53/udp
-ADD ./dns /home/dns
+FROM scratch
+# EXPOSE 53/udp
+WORKDIR /home/weave
+ADD ./dns /home/weave/weavedns
+ENTRYPOINT ["/home/weave/weavedns"]
diff --git a/dns/Makefile b/dns/Makefile
new file mode 100644
index 00000000..63939da5
--- /dev/null
+++ b/dns/Makefile
@@ -0,0 +1,20 @@
+IMAGE:=/tmp/weavedns.tar
+
+.DEFAULT: docker-image
+
+all: docker-image
+
+dns: ../*.go main.go
+	go get && GOARCH=amd64 GOOS=linux go build -v
+
+.PHONY: docker-image
+
+docker-image: $(IMAGE)
+
+$(IMAGE): Dockerfile dns
+	sudo -E docker build --rm -t zettio/weavedns .
+	sudo -E docker save zettio/weavedns > $(IMAGE)
+
+clean:
+	-sudo docker rmi zettio/weavedns
+	rm -f dns $(IMAGE)