diff --git a/ChangeLog b/ChangeLog
index c821ce495..7bb201572 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-16  Clint Adams  <clint@zsh.org>
+
+	* 26141: Functions/Zle/edit-command-line: word-split
+	EDITOR/VISUAL so users can have multi-argument
+	commands in those variables.
+
 2008-12-11  Peter Stephenson  <pws@csr.com>
 
 	* Frank Terbeck: 26125: Doc/Zsh/contrib.yo,
diff --git a/Functions/Zle/edit-command-line b/Functions/Zle/edit-command-line
index 4a9b10a1a..62a59a72e 100644
--- a/Functions/Zle/edit-command-line
+++ b/Functions/Zle/edit-command-line
@@ -10,7 +10,7 @@ local tmpfile=${TMPPREFIX:-/tmp/zsh}ecl$$
 
 print -R - "$PREBUFFER$BUFFER" >$tmpfile
 exec </dev/tty
-${VISUAL:-${EDITOR:-vi}} $tmpfile
+${=${VISUAL:-${EDITOR:-vi}}} $tmpfile
 print -Rz - "$(<$tmpfile)" 
 
 command rm -f $tmpfile