diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..7004a17
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,34 @@
+DEPS = $(shell go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
+
+default: all
+
+all: deps format build
+
+deps:
+	@echo "--> Installing build dependencies"
+	@go get -d -v ./... $(DEPS)
+
+updatedeps: deps
+	@echo "--> Updating build dependencies"
+	@go get -d -f -u ./... $(DEPS)
+
+format: deps
+	@echo "--> Running go fmt"
+	@go fmt ./...
+
+build: deps
+	@echo "--> Building client"
+	@go build -o client/client client/client.go
+	@echo "--> Building registry"
+	@go build -o registry/registry registry/datastore.go registry/registry.go
+
+test: deps
+	@go test ./...
+
+testrace: deps
+	@go test -race ./...
+
+clean:
+	@echo "--> Cleaning binaries"
+	@go clean ./client
+	@go clean ./registry
\ No newline at end of file
diff --git a/registry/registry.go b/registry/registry.go
index b503c9b..ed37eb1 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -225,11 +225,12 @@ func getImagesList(w http.ResponseWriter, r *http.Request) (int, string) {
 
 func createTorrentFile(torrentFileName, root, announcePath string) (err error) {
 	var metaInfo *torrent.MetaInfo
-	metaInfo, err = torrent.CreateMetaInfoFromFileSystem(nil, root, 0, false)
+	btHost := *tracker
+	metaInfo, err = torrent.CreateMetaInfoFromFileSystem(nil, root, btHost, 0, false)
 	if err != nil {
 		return
 	}
-	btHost := *tracker
+
 	metaInfo.Announce = "http://" + btHost + "/announce"
 	metaInfo.CreatedBy = "docket-registry"
 	var torrentFile *os.File