diff --git a/lib/ChangeLog b/lib/ChangeLog
index a8c948249..739287ea6 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-28  Leonard den Ottolander  <leonard den ottolander nl>
+
+	* mc-wrapper.sh.in: Handle user names with spaces.
+	* mc-wrapper.csh.in: Likewise.
+
 2006-02-19  Nerijus Baliunas  <nerijus@users.sourceforge.net>
 
 	* mc.ext.in: Open gimp in the background.
diff --git a/lib/mc-wrapper.csh.in b/lib/mc-wrapper.csh.in
index 961d53f17..fa715f728 100644
--- a/lib/mc-wrapper.csh.in
+++ b/lib/mc-wrapper.csh.in
@@ -9,7 +9,7 @@ endif
 @bindir@/mc -P "$MC_PWD_FILE" $*
 
 if (-r "$MC_PWD_FILE") then
-	setenv MC_PWD "`cat $MC_PWD_FILE`"
+	setenv MC_PWD "`cat '$MC_PWD_FILE'`"
 	if ( -d "$MC_PWD" ) then
 		cd "$MC_PWD"
 	endif
diff --git a/lib/mc-wrapper.sh.in b/lib/mc-wrapper.sh.in
index 58b4341f5..a27a81bf9 100644
--- a/lib/mc-wrapper.sh.in
+++ b/lib/mc-wrapper.sh.in
@@ -3,7 +3,7 @@ MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
 @bindir@/mc -P "$MC_PWD_FILE" "$@"
 
 if test -r "$MC_PWD_FILE"; then
-	MC_PWD="`cat $MC_PWD_FILE`"
+	MC_PWD="$(cat "$MC_PWD_FILE")"
 	if test -n "$MC_PWD" && test -d "$MC_PWD"; then
 		cd "$MC_PWD"
 	fi