diff --git a/ChangeLog b/ChangeLog
index cf2242bd8..4fa42e068 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-06  Peter Stephenson  <pws@csr.com>
 
+	* 20232 with typo corrected: Functions/Zftp/zfcd: remove
+	cached directory listing when changing directory.
+
 	* unposted: Config/version.mk: version 4.2.1-test-A.
 
 2004-08-01  Clint Adams  <clint@zsh.org>
diff --git a/Functions/Zftp/zfcd b/Functions/Zftp/zfcd
index 05b7dc998..381d83ee7 100644
--- a/Functions/Zftp/zfcd
+++ b/Functions/Zftp/zfcd
@@ -48,8 +48,11 @@ fi
 # if we want to keep it.
 local lastdir=$ZFTP_PWD
 
-zftp cd "$@" && [[ $lastdir != $ZFTP_PWD ]] &&
-zfconfig[lastdir_$ZFTP_SESSION]=$lastdir
+if zftp cd "$@" && [[ $lastdir != $ZFTP_PWD ]]; then
+  # Invalidate current directory listing.
+  rm -f $zfconfig[curdir_$ZFTP_SESSION]
+  zfconfig[lastdir_$ZFTP_SESSION]=$lastdir
+fi
 
 print $zfconfig[lastloc_$ZFTP_SESSION]
 # }