diff --git a/.dockerignore b/.dockerignore
index 4896a7491..3f63ce68d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
 cfssl_*
 *-amd64
 *-386
+dist/*
diff --git a/.gitignore b/.gitignore
index 4896a7491..3f63ce68d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 cfssl_*
 *-amd64
 *-386
+dist/*
diff --git a/Dockerfile b/Dockerfile
index c90d829da..9604d8fad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV USER root
 
 EXPOSE 8888
 
-ENTRYPOINT ["cfssl"]
+CMD ["cfssl"]
 
 RUN go get github.com/cloudflare/cf-tls/tls
 RUN go get github.com/cloudflare/go-metrics
@@ -17,6 +17,8 @@ RUN go get golang.org/x/crypto/ocsp
 
 ADD . /go/src/github.com/cloudflare/cfssl
 
-RUN go build cmd/cfssl/cfssl.go && cp cfssl /usr/local/bin
+RUN go build cmd/... && \
+  cp cfssl /usr/local/bin && \
+  cp multirootca /usr/local/bin
 
 WORKDIR /opt
diff --git a/script/build b/script/build
index 89a548964..fe5208f96 100755
--- a/script/build
+++ b/script/build
@@ -21,4 +21,5 @@ fi
 # Get rid of existing binaries
 rm -f *-386
 rm -f *-amd64
-docker run --rm -v `pwd`:/go/src/github.com/cloudflare/cfssl cfssl-build gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" -output="{{.Dir}}_{{.OS}}-{{.Arch}}" -ldflags="-w" ./cmd/...
+rm -f dist/*
+docker run --rm -v `pwd`:/go/src/github.com/cloudflare/cfssl cfssl-build gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" -output="dist/{{.Dir}}_{{.OS}}-{{.Arch}}" -ldflags="-w" ./cmd/...