diff --git a/.gitignore b/.gitignore
index daf913b1b347aae6de6f48d599bc89ef8c8693d6..2e43c5107c49f673854c3442dbc81ca551fa4c31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ _testmain.go
 *.exe
 *.test
 *.prof
+
+dist/*
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..00d0221dd629ba33c042706f8e966f3156c93394
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+build: dist/go-httpbin
+
+dist/go-httpbin: *.go httpbin/*.go
+	mkdir -p dist
+	go build -o dist/go-httpbin
+
+test:
+	go test -v github.com/mccutchen/go-httpbin/httpbin
+
+run: build
+	./dist/go-httpbin
+
+clean:
+	rm -r dist
+
+deps:
+	go get -u github.com/jteeuwen/go-bindata/...
+
+.PHONY: all