diff --git a/tm-monitor/Dockerfile b/tm-monitor/Dockerfile
new file mode 100644
index 000000000..fba7780a1
--- /dev/null
+++ b/tm-monitor/Dockerfile
@@ -0,0 +1,9 @@
+FROM alpine:3.5
+
+WORKDIR /app
+COPY tm-monitor /app/tm-monitor
+
+# look for local Tendermint node by default
+CMD ["localhost:46657"]
+
+ENTRYPOINT ["./tm-monitor"]
diff --git a/tm-monitor/Makefile b/tm-monitor/Makefile
index 9b7ba2ab6..28bf55a24 100644
--- a/tm-monitor/Makefile
+++ b/tm-monitor/Makefile
@@ -1,11 +1,48 @@
+DIST_DIRS := find * -type d -exec
+VERSION := $(shell perl -ne '/^var version.*"([^"]+)".*$$/ && print "v$$1\n"' main.go)
 GOTOOLS = \
-					github.com/Masterminds/glide
+					github.com/Masterminds/glide \
+					github.com/mitchellh/gox
 
 tools:
 	go get -v $(GOTOOLS)
 
 get_deps: tools
-	@echo "--> Running glide install"
-	@glide install
+	glide install
 
-.PHONY: get_deps
+build:
+	go build -ldflags "-X main.version=${VERSION}"
+
+install:
+	go install -ldflags "-X main.version=${VERSION}"
+
+test:
+	go test
+
+build-all: tools
+	gox -verbose \
+		-ldflags "-X main.version=${VERSION}" \
+		-os="linux darwin windows freebsd openbsd netbsd" \
+		-arch="amd64 386 armv5 armv6 armv7 arm64" \
+		-osarch="!darwin/arm64" \
+		-output="dist/{{.OS}}-{{.Arch}}/{{.Dir}}" .
+
+dist: build-all
+	cd dist && \
+		$(DIST_DIRS) cp ../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf tm-monitor-${VERSION}-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r tm-monitor-${VERSION}-{}.zip {} \; && \
+		cd ..
+
+build-docker:
+	rm -f ./tm-monitor
+	docker run -it --rm -v "$(PWD):/go/src/app" -w "/go/src/app" -e "CGO_ENABLED=0" golang:alpine go build -ldflags "-X main.version=${VERSION}" -o tm-monitor
+	docker build -t "tendermint/tm-monitor" .
+
+clean:
+	rm -f ./tm-monitor.log
+	rm -f ./tm-monitor
+	rm -rf ./dist
+
+.PHONY: tools get_deps build install test build-all dist clean build-docker
diff --git a/tm-monitor/main.go b/tm-monitor/main.go
index 44b7ad427..51de0fa9a 100644
--- a/tm-monitor/main.go
+++ b/tm-monitor/main.go
@@ -11,6 +11,8 @@ import (
 	log15 "github.com/tendermint/log15"
 )
 
+var version = "0.2.0"
+
 var log = logger.New()
 
 func main() {