diff --git a/Makefile b/Makefile
index 3062d5b6..2285d53c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,17 @@
 SUDO=sudo
 
 WEAVER_EXE=weaver/weaver
+WEAVEDNS_EXE=weavedns/weavedns
 WEAVER_IMAGE=zettio/weave
+WEAVEDNS_IMAGE=zettio/weavedns
 WEAVER_EXPORT=/var/tmp/weave.tar
+WEAVEDNS_EXPORT=/var/tmp/weavedns.tar
 
-all: $(WEAVER_EXPORT)
+all: $(WEAVER_EXPORT) $(WEAVEDNS_EXPORT)
 
-$(WEAVER_EXE): router/*.go weaver/main.go
-	go get -tags netgo ./weaver
-	go build -ldflags '-extldflags "-static"' -tags netgo -o $@ ./weaver
+$(WEAVER_EXE) $(WEAVEDNS_EXE):
+	go get -tags netgo ./$(shell dirname $@)
+	go build -ldflags '-extldflags "-static"' -tags netgo -o $@ ./$(shell dirname $@)
 	@strings $@ | grep cgo_stub\\\.go >/dev/null || { \
 		rm $@; \
 		echo "\nYour go standard library was built without the 'netgo' build tag."; \
@@ -21,15 +24,22 @@ $(WEAVER_EXE): router/*.go weaver/main.go
 		false; \
 	}
 
+$(WEAVER_EXE): router/*.go weaver/main.go
+$(WEAVEDNS_EXE): nameserver/*.go weavedns/main.go
+
 $(WEAVER_EXPORT): weaver/Dockerfile $(WEAVER_EXE)
 	$(SUDO) docker build -t $(WEAVER_IMAGE) weaver
 	$(SUDO) docker save $(WEAVER_IMAGE):latest > $@
 
+$(WEAVEDNS_EXPORT): weavedns/Dockerfile $(WEAVEDNS_EXE)
+	$(SUDO) docker build -t $(WEAVEDNS_IMAGE) weavedns
+	$(SUDO) docker save $(WEAVEDNS_IMAGE):latest > $@
+
 publish: $(WEAVER_EXPORT)
 	$(SUDO) docker tag $(WEAVER_IMAGE) $(WEAVER_IMAGE):git-`git rev-parse --short=12 HEAD`
 	$(SUDO) docker push $(WEAVER_IMAGE):latest
 	$(SUDO) docker push $(WEAVER_IMAGE):git-`git rev-parse --short=12 HEAD`
 
 clean:
-	-$(SUDO) docker rmi $(WEAVER_IMAGE)
-	rm -f $(WEAVER_EXE) $(WEAVER_EXPORT)
+	-$(SUDO) docker rmi $(WEAVER_IMAGE) $(WEAVEDNS_IMAGE)
+	rm -f $(WEAVER_EXE) $(WEAVEDNS_EXE) $(WEAVER_EXPORT) $(WEAVEDNS_EXPORT)
diff --git a/weavedns/main.go b/weavedns/main.go
index 79c8a51a..019dc1f1 100644
--- a/weavedns/main.go
+++ b/weavedns/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"flag"
-	weavedns "github.com/zettio/weavedns/nameserver"
+	weavedns "github.com/zettio/weave/nameserver"
 	"io/ioutil"
 	"net"
 	"os"