diff --git a/ChangeLog b/ChangeLog
index 231d2da47..0d2994496 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-15  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* users/11398: Src/zle_move.c: vi-goto-mark was broken
+	by multibyte characters.
+
 2007-04-14  Clint Adams  <schizo@debian.org>
 
 	* 23275: Completion/Unix/Command/_date: change order of
diff --git a/Src/Zle/zle_move.c b/Src/Zle/zle_move.c
index fb597004d..9b91f8885 100644
--- a/Src/Zle/zle_move.c
+++ b/Src/Zle/zle_move.c
@@ -484,9 +484,10 @@ int
 vigotomark(UNUSED(char **args))
 {
     ZLE_INT_T ch;
+    LASTFULLCHAR_T lfc = LASTFULLCHAR;
 
     ch = getfullchar(0);
-    if (ch == LASTFULLCHAR)
+    if (ch == lfc)
 	ch = 26;
     else {
 	if (ch < ZWC('a') || ch > ZWC('z'))