diff --git a/ChangeLog b/ChangeLog
index 9bb451148..027a88aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-10-31  Pavel Roskin  <proski@gnu.org>
 
+	* lib/mc.csh.in: Add quoting and check for missing file.
+
 	* 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.
diff --git a/lib/mc.csh.in b/lib/mc.csh.in
index 67b7aca9e..80176c287 100644
--- a/lib/mc.csh.in
+++ b/lib/mc.csh.in
@@ -1 +1 @@
-alias mc 'setenv MC_PWD_FILE /tmp/mc-$USER/mc.pwd.$$; @prefix@/bin/mc -P "$MC_PWD_FILE" \!*; cd "`cat $MC_PWD_FILE`"; rm -f "$MC_PWD_FILE"; unsetenv MC_PWD_FILE'
+alias mc 'setenv MC_PWD_FILE /tmp/mc-$USER/mc.pwd.$$; @prefix@/bin/mc -P "$MC_PWD_FILE" \!*; if -r "$MC_PWD_FILE" cd "`cat $MC_PWD_FILE`"; rm -f "$MC_PWD_FILE"; unsetenv MC_PWD_FILE'