diff --git a/docker/Makefile b/docker/Makefile
index d7f24eb0..c4e1a207 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,18 +1,18 @@
 IMAGE:=/tmp/weavedns.tar
-MAIN:=../main
+MAIN:=../
 
 .DEFAULT: docker-image
 
 all: docker-image
 
-dns: ../*.go ../main/main.go
-	go get $(MAIN) && GOARCH=amd64 GOOS=linux go build -o weavedns -v $(MAIN)
+weavedns: ../server/*.go ../main.go
+	go get $(MAIN) && GOARCH=amd64 GOOS=linux go build -o $@ -v $(MAIN)
 
 .PHONY: docker-image
 
 docker-image: $(IMAGE)
 
-$(IMAGE): Dockerfile dns
+$(IMAGE): Dockerfile weavedns
 	sudo -E docker build -t zettio/weavedns .
 	sudo -E docker save zettio/weavedns > $(IMAGE)
 
diff --git a/main.go b/main.go
index a1ee520c..076d2bcf 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/miekg/dns"
-	"github.com/zettio/weavedns"
+	"github.com/zettio/weavedns/server"
 	"log"
 	"net"
 )