diff --git a/man/Dockerfile b/man/Dockerfile
index d4eb76ad6b..5657d13c92 100644
--- a/man/Dockerfile
+++ b/man/Dockerfile
@@ -1,16 +1,20 @@
-FROM    golang:1.6.3-alpine
+FROM    alpine:3.4
 
-RUN     apk add -U git bash curl gcc musl-dev
+RUN     apk add -U git go bash curl gcc musl-dev make
 
-RUN     export GLIDE=0.10.2; \
-        export SRC=https://github.com/Masterminds/glide/releases/download/; \
-        curl -sL ${SRC}/${GLIDE}/glide-${GLIDE}-linux-amd64.tar.gz | \
-        tar -xz linux-amd64/glide && \
-        mv linux-amd64/glide /usr/bin/glide && \
-        chmod +x /usr/bin/glide
+RUN     mkdir -p /go/src /go/bin /go/pkg
+ENV     GOPATH=/go
+RUN     export GLIDE=v0.11.1; \
+        export TARGET=/go/src/github.com/Masterminds; \
+        mkdir -p ${TARGET} && \
+        git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
+        cd ${TARGET}/glide && \
+        make build && \
+        cp ./glide /usr/bin/glide && \
+        cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*
 
-COPY    man/glide.yaml /manvendor/
-COPY    man/glide.lock /manvendor/
+COPY    glide.yaml /manvendor/
+COPY    glide.lock /manvendor/
 WORKDIR /manvendor/
 RUN     glide install && mv vendor src
 ENV     GOPATH=$GOPATH:/go/src/github.com/docker/docker/vendor:/manvendor
diff --git a/man/Dockerfile.armhf b/man/Dockerfile.armhf
new file mode 100644
index 0000000000..a3552c660b
--- /dev/null
+++ b/man/Dockerfile.armhf
@@ -0,0 +1,24 @@
+FROM    armhf/alpine:3.4
+
+RUN     apk add -U git go bash curl gcc musl-dev make
+
+RUN     mkdir -p /go/src /go/bin /go/pkg
+ENV     GOPATH=/go
+RUN     export GLIDE=v0.11.1; \
+        export TARGET=/go/src/github.com/Masterminds; \
+        mkdir -p ${TARGET} && \
+        git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
+        cd ${TARGET}/glide && \
+        make build && \
+        cp ./glide /usr/bin/glide && \
+        cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*
+
+COPY    glide.yaml /manvendor/
+COPY    glide.lock /manvendor/
+WORKDIR /manvendor/
+RUN     glide install && mv vendor src
+ENV     GOPATH=$GOPATH:/go/src/github.com/docker/docker/vendor:/manvendor
+RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
+
+WORKDIR /go/src/github.com/docker/docker/
+ENTRYPOINT ["man/generate.sh"]