diff --git a/ChangeLog b/ChangeLog
index eb0a05328..e373df19c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-24  Clint Adams  <clint@zsh.org>
 
+	* 21517: Completion/Unix/Command/_baz: complete files after
+	build-config if there's a configs subdir, even if one is not in a
+	project tree.
+
 	* 21510: Config/installfns.sh: use && rather than -a binary
 	test operator.
 
diff --git a/Completion/Unix/Command/_baz b/Completion/Unix/Command/_baz
index a15596488..75363e4e4 100644
--- a/Completion/Unix/Command/_baz
+++ b/Completion/Unix/Command/_baz
@@ -54,8 +54,12 @@ _baz_config () {
   [[ -n "$n" ]] && configdir=$opt_args[$n]
   root="$(_call_program baz $BAZ tree-root ${configdir} 2>&1)"
   if (( $? )); then
-    _message -e messages "Error: $root"
-    return $ret
+    if [[ -d "configs" ]]; then
+      root=.
+    else
+      _message -e messages "Error: $root"
+      return $ret
+    fi
   fi
 
   if [[ -d "$root/configs" ]]; then