diff --git a/ChangeLog b/ChangeLog
index 5d679dacc..7572a06b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-03  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 38576: Completion/Unix/Command/_git: Also detect
+	_git-${thirdparty} functions in $fpath that are symlinks.
+
 2016-06-02  Eric Cook <llua@gmx.com>
 
 	* 38567: Marko Myllynen: Completion/Unix/Command/_locale:
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 2fa004a5e..1dca28802 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -7022,7 +7022,7 @@ declare -gUa _git_third_party_commands
 _git_third_party_commands=()
 
 local file
-for file in ${^fpath}/_git-*~(*~|*.zwc)(.N); do
+for file in ${^fpath}/_git-*~(*~|*.zwc)(-.N); do
   local name=${${file:t}#_git-}
   if (( $+_git_third_party_commands[$name] )); then
     continue