diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index d45dd6b19..77f5c426e 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-25  Denis Vlasenko  <vda.linux@googlemail.com> 
+
+	* extfs/audio.in (audiofs_copyout): Quote the track name.
+	* extfs/bpp (mcbppfs_list): Quote the package file name.
+	* extfs/uzoo.in (mklink): Quote MC_TMPDIR.
+
 2006-07-19  Egmont Koblinger  <egmont@uhulinux.hu>
 
 	* extfs/iso9660.in (test_iso): Use `locale charmap' to retrieve
diff --git a/vfs/extfs/audio.in b/vfs/extfs/audio.in
index 40227fcbc..05c8c65a4 100755
--- a/vfs/extfs/audio.in
+++ b/vfs/extfs/audio.in
@@ -35,7 +35,7 @@ audiofs_copyout()
 	wget -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+read+$RESPONSE&$CDDB_HANDSHAKE" | grep -v "^#" >> "$3"
     else
         TRACK=`echo "$2" | sed 's/track-0*//' | sed 's/\.wav//'`
-        cdparanoia -q -d "$1" $TRACK "$3" >/dev/null
+        cdparanoia -q -d "$1" "$TRACK" "$3" >/dev/null
     fi
 }
 
diff --git a/vfs/extfs/bpp b/vfs/extfs/bpp
index f9a0fd2f3..f71fe7e79 100644
--- a/vfs/extfs/bpp
+++ b/vfs/extfs/bpp
@@ -17,7 +17,7 @@ mcbppfs_list ()
     FILEPREF="-r--r--r--   1 root     root    "
     FIEXPREF="-r-xr-xr-x   1 root     root    "
     DATE=`date +"%b %d %H:%M"`
-    set x `ls -l $1`
+    set x `ls -l "$1"`
     size=$6
     echo "$FILEPREF $size $DATE CONTENTS.tar.gz"
     echo "$FIEXPREF 35 $DATE INSTALL"
diff --git a/vfs/extfs/uzoo.in b/vfs/extfs/uzoo.in
index 3f978deb7..fb81ae39d 100644
--- a/vfs/extfs/uzoo.in
+++ b/vfs/extfs/uzoo.in
@@ -14,10 +14,10 @@ ZOO=zoo
 mklink ()
 {
     TMPDIR=`mktemp -d ${MC_TMPDIR:-/tmp}/mctmpdir-uzoo.XXXXXX` || exit 1
-    trap 'cd /; rm -rf $TMPDIR' 0 1 2 3 5 13 15
-    ARCHIVE=$TMPDIR/tmp.zoo
+    trap 'cd /; rm -rf "$TMPDIR"' 0 1 2 3 5 13 15
+    ARCHIVE="$TMPDIR/tmp.zoo"
     ln -sf "$1" "$ARCHIVE"
-    cd $TMPDIR || exit 1
+    cd "$TMPDIR" || exit 1
 }
 
 mczoofs_list ()