diff --git a/lib/mc.csh.in b/lib/mc.csh.in
index b141a7797..67b7aca9e 100644
--- a/lib/mc.csh.in
+++ b/lib/mc.csh.in
@@ -1,2 +1 @@
-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'
-
+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'