diff --git a/Dockerfile b/Dockerfile
index 1207569aea..5d6e5f23e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -151,8 +151,11 @@ RUN set -x \
 	&& go install -v github.com/cpuguy83/go-md2man
 
 # install toml validator
-RUN git clone -b v0.1.0 https://github.com/BurntSushi/toml.git /go/src/github.com/BurntSushi/toml \
-    && go install -v github.com/BurntSushi/toml/cmd/tomlv
+ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
+RUN set -x \
+	&& git clone https://github.com/BurntSushi/toml.git /go/src/github.com/BurntSushi/toml \
+	&& (cd /go/src/github.com/BurntSushi/toml && git checkout -q $TOMLV_COMMIT) \
+	&& go install -v github.com/BurntSushi/toml/cmd/tomlv
 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
 ENTRYPOINT ["hack/dind"]
diff --git a/MAINTAINERS b/MAINTAINERS
index b8c31bfebe..3e0639f975 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12,9 +12,9 @@
 
 	[Rules.maintainers]
 
-	title = "What is a maintainer?"
+		title = "What is a maintainer?"
 
-	text = """
+		text = """
 There are different types of maintainers, with different responsibilities, but
 all maintainers have 3 things in common:
 
@@ -531,6 +531,11 @@ made through a pull request.
 	Email = "lk4d4@docker.com"
 	GitHub = "lk4d4"
 
+	[people.mary]
+	Name = "Mary Anthony"
+	Email = "mary.anthony@docker.com"
+	GitHub = "moxiegirl"
+
 	[people.shykes]
 	Name = "Solomon Hykes"
 	Email = "solomon@docker.com"
@@ -590,7 +595,3 @@ made through a pull request.
 	Name = "Vishnu Kannan"
 	Email = "vishnuk@google.com"
 	GitHub = "vishh"
-
-	[people.mary]
-	Name = "Mary Anthony"
-	Email = "mary.anthony@docker.com"
diff --git a/project/make/validate-toml b/project/make/validate-toml
index 46ece77980..16c228d14e 100644
--- a/project/make/validate-toml
+++ b/project/make/validate-toml
@@ -9,13 +9,13 @@ unset IFS
 badFiles=()
 for f in "${files[@]}"; do
 	# we use "git show" here to validate that what's committed is formatted
-	if [ "$(git show "$VALIDATE_HEAD:$f" | tomlv)" ]; then
+	if ! git show "$VALIDATE_HEAD:$f" | tomlv /proc/self/fd/0 ; then
 		badFiles+=( "$f" )
 	fi
 done
 
 if [ ${#badFiles[@]} -eq 0 ]; then
-	echo 'Congratulations!  All toml source files have valid syntax.'
+	echo 'Congratulations!  All toml source files changed here have valid syntax.'
 else
 	{
 		echo "These files are not valid toml:"