diff --git a/.gitignore b/.gitignore
index 408c5e10d..2f9db73ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ oci
 
 *.1
 *.patch
+
+# Temporary symbol links
+Godeps/_workspace/src/github.com/opencontainers/runtime-tools
diff --git a/Makefile b/Makefile
index f1a6a7a14..99dab6d94 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,10 @@ PREFIX ?= $(DESTDIR)/usr
 BINDIR ?= $(DESTDIR)/usr/bin
 
 BUILDTAGS=
+RUNTIME_TOOLS_LINK := $(CURDIR)/Godeps/_workspace/src/github.com/opencontainers/runtime-tools
 export GOPATH:=$(CURDIR)/Godeps/_workspace:$(GOPATH)
 
-all:
+all: $(RUNTIME_TOOLS_LINK)
 	go build -tags "$(BUILDTAGS)" -o oci-runtime-tool ./cmd/oci-runtime-tool
 	go build -tags "$(BUILDTAGS)" -o runtimetest ./cmd/runtimetest
 
@@ -24,6 +25,10 @@ install: man
 
 clean:
 	rm -f oci-runtime-tool runtimetest *.1
+	rm -f $(RUNTIME_TOOLS_LINK)
+
+$(RUNTIME_TOOLS_LINK):
+	ln -sf $(CURDIR) $(RUNTIME_TOOLS_LINK)
 
 .PHONY: test .gofmt .govet .golint