diff --git a/Dockerfile b/Dockerfile
index 25f31529..30363eae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,16 @@
-FROM golang
-
-COPY . /go/src/github.com/docker/distribution
-
-# Fetch any dependencies to run the registry
-RUN go get github.com/docker/distribution/...
-RUN go install github.com/docker/distribution/cmd/registry
+FROM golang:1.4
 
 ENV CONFIG_PATH /etc/docker/registry/config.yml
-COPY ./cmd/registry/config.yml $CONFIG_PATH
+RUN mkdir -pv "$(dirname $CONFIG_PATH)"
+
+ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
+WORKDIR $DISTRIBUTION_DIR
+COPY . $DISTRIBUTION_DIR
+ENV GOPATH $GOPATH:$DISTRIBUTION_DIR/Godeps/_workspace
+
+RUN go install -v ./cmd/registry
+
+RUN cp -lv ./cmd/registry/config.yml $CONFIG_PATH
 
 EXPOSE 5000
-ENV PATH /go/bin
 CMD registry $CONFIG_PATH