diff --git a/third_party/nlbuild-autotools/repo/.default-version b/third_party/nlbuild-autotools/repo/.default-version
index 26ca59460..4cda8f19e 100644
--- a/third_party/nlbuild-autotools/repo/.default-version
+++ b/third_party/nlbuild-autotools/repo/.default-version
@@ -1 +1 @@
-1.5.1
+1.5.2
diff --git a/third_party/nlbuild-autotools/repo/CHANGES b/third_party/nlbuild-autotools/repo/CHANGES
index fa589611d..39e1394e4 100644
--- a/third_party/nlbuild-autotools/repo/CHANGES
+++ b/third_party/nlbuild-autotools/repo/CHANGES
@@ -1,3 +1,8 @@
+1.5.2 (2018-04-26)
+
+        * Since the '--name-only' option only appears in git-2.6 and later
+          and there are production systems using git version as old as
+          git-1.9, do not use '--name-only' when processing 'repos.conf'.
 
 1.5.1 (2018-04-20)
 
diff --git a/third_party/nlbuild-autotools/repo/make/pre/macros/git.mak b/third_party/nlbuild-autotools/repo/make/pre/macros/git.mak
index 145e01125..3d810269e 100644
--- a/third_party/nlbuild-autotools/repo/make/pre/macros/git.mak
+++ b/third_party/nlbuild-autotools/repo/make/pre/macros/git.mak
@@ -30,7 +30,7 @@ nlGitGetConfigFromFileCommand         = $(GIT) config --file $(1)
 #
 # Command to list all variables set in the specified config file <file>
 
-nlGitListConfigFromFileCommand        = $(call nlGitGetConfigFromFileCommand,$(1)) --list --name-only
+nlGitListConfigFromFileCommand        = $(call nlGitGetConfigFromFileCommand,$(1)) --list
 
 # nlGitGetConfigFromFile <file>
 #
@@ -38,7 +38,7 @@ nlGitListConfigFromFileCommand        = $(call nlGitGetConfigFromFileCommand,$(1
 
 nlGitGetConfigFromFile                = $(shell $(call nlGitGetConfigFromFileCommand,$(1)))
 
-# NlGitListConfigFromFile <file>
+# nlGitListConfigFromFile <file>
 #
 # List all variables set in the specified config file <file>