diff --git a/ChangeLog b/ChangeLog
index 0651910c3..7e7251a37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-13  Clint Adams  <clint@zsh.org>
+
+	* 21718: Completion/Unix/Command/_bzr: complete files
+	after bzr's first argument until the bzr shell-complete
+	stuff is improved.
+
 2005-09-09  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
 
 	* 21722: Src/utils.c, Src/Zle/zle.h, Src/Zle/zle_misc.c,
diff --git a/Completion/Unix/Command/_bzr b/Completion/Unix/Command/_bzr
index 4da09352b..26e992dd3 100644
--- a/Completion/Unix/Command/_bzr
+++ b/Completion/Unix/Command/_bzr
@@ -7,5 +7,7 @@ _bzr_subcommands=(${(f)"$(_call_program bzr bzr shell-complete)"})
 if (( CURRENT == 2 )); then
   _describe -t subcommand 'subcommand' _bzr_subcommands
 else
-# this part missing
+# this part should call bzr shell-complete <subcmd> when
+# it has been tweaked properly
+  _files
 fi