diff --git a/ChangeLog b/ChangeLog
index 482059eaf..9bb451148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-10-31  Pavel Roskin  <proski@gnu.org>
 
+	* lib/mc.csh.in: Update to use the new -P option.  This script
+	has absolutely no protection against special symbols in
+	directory names and lacks TMPDIR support.
+
 	* lib/mc.sh.in: Update to use the new -P option.
 
 	* configure.in: Displaying the install paths is too problematic
diff --git a/lib/mc.csh.in b/lib/mc.csh.in
index c2364a871..b141a7797 100644
--- a/lib/mc.csh.in
+++ b/lib/mc.csh.in
@@ -1,2 +1,2 @@
-alias mc 'setenv MC `@prefix@/bin/mc -P \!*`; cd $MC; unsetenv MC'
+alias mc 'setenv MC_PWD_FILE /tmp/mc-$USER/mc.pwd.$$; @prefix@/bin/mc -P $MC_PWD_FILE \!*; cd `cat $MC_PWD_FILE`; unsetenv MC_PWD_FILE'