diff --git a/Makefile b/Makefile
index f6343e5..33721c9 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,10 @@ GO_MD2MAN ?= /usr/bin/go-md2man
 GO ?= /usr/bin/go
 PYTHONSITELIB=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(0))")
 VERSION=$(shell $(PYTHON) setup.py --version)
+export GOPATH = $(shell pwd)/godeps
 
 .PHONY: all
-all: python-build docs pylint-check dockertar-sha256-helper gotar
+all: python-build docs pylint-check dockertar-sha256-helper gotar gomtree
 
 .PHONY: test-python3-pylint
 test-python3-pylint:
@@ -55,6 +56,15 @@ clean:
 	$(PYTHON) setup.py clean
 	-rm -rf dist build *~ \#* *pyc .#* docs/*.1
 
+get-go-dependencies:
+	$(GO) get -u -d github.com/vbatts/go-mtree/cmd/gomtree
+
+godeps/src/github.com/vbatts/go-mtree/cmd/gomtree/main.go:
+	$(MAKE) get-go-dependencies
+
+gomtree: godeps/src/github.com/vbatts/go-mtree/cmd/gomtree/main.go
+	$(GO) build -o $@ $<
+
 .PHONY: install-only
 install-only:
 	$(PYTHON) setup.py install --install-scripts /usr/share/atomic `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
diff --git a/gomtree b/gomtree
index a7b391d..f02e494 100755
Binary files a/gomtree and b/gomtree differ