diff --git a/ChangeLog b/ChangeLog
index f6162f9..1eb197a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-07  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev 02633]
+	* url.c (parseURL2): filename should be quoted here, because
+	                   it will be unquote() soon
+
 2001-12-07  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* rename install.sh to install-sh
diff --git a/url.c b/url.c
index a5654e2..bc0381b 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,4 @@
-/* $Id: url.c,v 1.18 2001/12/03 18:15:12 ukai Exp $ */
+/* $Id: url.c,v 1.19 2001/12/06 15:44:41 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -1015,7 +1015,7 @@ parseURL2(char *url, ParsedURL *pu, ParsedURL *current)
 		char abs[_MAX_PATH];
 
 		_abspath(abs, pu->file, _MAX_PATH);
-		pu->file = cleanupName(abs);
+		pu->file = file_quote(cleanupName(abs));
 	    }
 	}
 #else
@@ -1029,7 +1029,7 @@ parseURL2(char *url, ParsedURL *pu, ParsedURL *current)
 	    if (Strlastchar(tmp) != '/')
 		Strcat_char(tmp, '/');
 	    Strcat_charp(tmp, pu->file);
-	    pu->file = cleanupName(tmp->ptr);
+	    pu->file = file_quote(cleanupName(tmp->ptr));
 	}
 #endif
 	else if (pu->scheme == SCM_HTTP