diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..9d10aa1ba1
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+.git
+docs
+MAINTAINERS
+README.md
diff --git a/Dockerfile b/Dockerfile
index 5ccf65ed26..29aa643f2c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,9 +21,9 @@ RUN buildDeps=' \
 	&& apk update \
 	&& apk add $buildDeps \
 	&& cd /go/src/github.com/docker/opensource \
-	&& go get -d -v github.com/docker/opensource/maintainers \
-	&& go generate ./maintainers \
-	&& go build -o /usr/bin/maintainers ./maintainers \
+	&& go get -d -v github.com/docker/opensource/maintainercollector \
+	&& go generate ./maintainercollector \
+	&& go build -o /usr/bin/maintainercollector ./maintainercollector \
 	&& apk del $buildDeps \
 	&& rm -rf /var/cache/apk/* \
 	&& rm -rf /go \
@@ -31,4 +31,4 @@ RUN buildDeps=' \
 
 WORKDIR /root/maintainers
 
-ENTRYPOINT [ "maintainers" ]
+ENTRYPOINT [ "maintainercollector" ]
diff --git a/maintainers/generate.go b/maintainercollector/generate.go
similarity index 88%
rename from maintainers/generate.go
rename to maintainercollector/generate.go
index ded6bb3a12..64297522d1 100644
--- a/maintainers/generate.go
+++ b/maintainercollector/generate.go
@@ -33,7 +33,7 @@ func generateFile(wd string, file string, target string) error {
 	if err != nil {
 		return err
 	}
-	out.Write([]byte("// This file is autogenerated; DO NOT EDIT DIRECTLY\n// See maintainers/generate.go for more info\npackage main\n\nconst (\n"))
+	out.Write([]byte("// This file is autogenerated; DO NOT EDIT DIRECTLY\n// See maintainercollector/generate.go for more info\npackage main\n\nconst (\n"))
 
 	out.Write([]byte(fmt.Sprintf("%s = %q", target, string(src))))
 
diff --git a/maintainers/main.go b/maintainercollector/main.go
similarity index 98%
rename from maintainers/main.go
rename to maintainercollector/main.go
index 8a89989989..c1fa0e8531 100644
--- a/maintainers/main.go
+++ b/maintainercollector/main.go
@@ -14,7 +14,7 @@ import (
 const (
 	ghRawUri = "https://raw.githubusercontent.com"
 	head     = `#
-# THIS FILE IS AUTOGENERATED; SEE "./maintainers"!
+# THIS FILE IS AUTOGENERATED; SEE "./maintainercollector"!
 #
 # Docker projects maintainers file
 #
diff --git a/maintainers/roles.toml b/maintainercollector/roles.toml
similarity index 100%
rename from maintainers/roles.toml
rename to maintainercollector/roles.toml
diff --git a/maintainers/rules.toml b/maintainercollector/rules.toml
similarity index 100%
rename from maintainers/rules.toml
rename to maintainercollector/rules.toml
diff --git a/maintainers/types.go b/maintainercollector/types.go
similarity index 100%
rename from maintainers/types.go
rename to maintainercollector/types.go