diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000000..8a5915de2a9
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+.PHONY: build
+build: 
+	go build ./...
+
+.PHONY: deps
+deps:
+	go get -t ./...
+	# goautotest is used from the Makefile to run tests in a loop
+	go get github.com/tsg/goautotest
+
+.PHONY: gofmt
+gofmt:
+	go fmt ./...
+
+.PHONY: test
+test:
+	go test -short ./...
+
+.PHONY: autotest
+autotest:
+	goautotest -short ./...
+
+.PHONY: testlong
+testlong:
+	go vet ./...
+	go test ./...
+
+.PHONY: benchmark
+benchmark:
+	go test -short -bench=. ./...