diff --git a/ChangeLog b/ChangeLog
index 6c8df2f35..b0ec383a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-09  Clint Adams  <clint@zsh.org>
+
+	* 22065: Functions/TCP/tcp_read: cope with TCP output that
+	starts with "--".
+
 2005-12-09  Peter Stephenson  <pws@csr.com>
 
 	* 22058: NEWS, Doc/Zsh/roadmap.yo: tweak docs for release.
diff --git a/Functions/TCP/tcp_read b/Functions/TCP/tcp_read
index aa30b723d..7d8acf865 100644
--- a/Functions/TCP/tcp_read
+++ b/Functions/TCP/tcp_read
@@ -216,7 +216,7 @@ while (( ${#read_fds} )); do
     fi
 
     tcp_output -P "${TCP_PROMPT=<-[%s] }" -S $sess -F $read_fd \
-        $noprint "$line"
+        $noprint -- "$line"
     # REPLY is now set to the line with an appropriate prompt.
     tcp_lines+=($REPLY)
     typeset -g TCP_LINE="$REPLY" TCP_LINE_FD="$read_fd"