diff -urN portage/bin/ebuild.sh portage-patched/bin/ebuild.sh
--- portage/bin/ebuild.sh	2005-09-27 10:27:48.000000000 +0930
+++ portage-patched/bin/ebuild.sh	2005-09-27 10:30:04.000000000 +0930
@@ -350,6 +350,7 @@
 	[ -z "$*" ] && die "Nothing passed to the 'unpack' command"
 
 	for x in "$@"; do
+		x=`echo ${x} | sed 's/%20/ /g'`
 		echo ">>> Unpacking ${x} to ${PWD}"
 		y=${x%.*}
 		y=${y##*.}
diff -urN portage/pym/portage.py portage-patched/pym/portage.py
--- portage/pym/portage.py	2005-09-27 10:27:48.000000000 +0930
+++ portage-patched/pym/portage.py	2005-09-27 10:29:26.000000000 +0930
@@ -1712,6 +1712,7 @@
 	primaryuri_indexes={}
 	for myuri in myuris:
 		myfile=os.path.basename(myuri)
+		myfile=myfile.replace('%20', ' ')
 		if not filedict.has_key(myfile):
 			filedict[myfile]=[]
 			for y in range(0,len(locations)):
@@ -5400,6 +5401,7 @@
 
 		myfiles = []
 		for x in newuris:
+			x=x.replace('%20', ' ')
 			mya = os.path.basename(x)
 			if not mya in myfiles:
 				myfiles.append(mya)