diff --git a/ChangeLog b/ChangeLog
index 927b12541..56a1a79ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-17  Peter Stephenson  <pws@csr.com>
+
+	* Frank: 27717: Functions/VCS_Info/vcs_info_lastmsg:
+	add option terminators for builtins.
+
 2010-12-17  Andrey Borzenkov <bor@zsh.org>
 
 	* unposted: Doc/Zsh/compsys.yo: typo fix
@@ -12769,5 +12774,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4904 $
+* $Revision: 1.4905 $
 *****************************************************
diff --git a/Functions/VCS_Info/vcs_info_lastmsg b/Functions/VCS_Info/vcs_info_lastmsg
index fe33590e1..ddfaaf88b 100644
--- a/Functions/VCS_Info/vcs_info_lastmsg
+++ b/Functions/VCS_Info/vcs_info_lastmsg
@@ -9,11 +9,11 @@ local -ix maxexports
 
 VCS_INFO_maxexports
 for i in {0..$((maxexports - 1))} ; do
-    printf '$vcs_info_msg_%d_: "' $i
+    printf -- '$vcs_info_msg_%d_: "' $i
     if zstyle -T ':vcs_info:formats:command:-all-' use-prompt-escapes ; then
-        print -nP ${(P)${:-vcs_info_msg_${i}_}}
+        print -nP -- ${(P)${:-vcs_info_msg_${i}_}}
     else
-        print -n ${(P)${:-vcs_info_msg_${i}_}}
+        print -n -- ${(P)${:-vcs_info_msg_${i}_}}
     fi
     printf '"\n'
 done