diff --git a/updown/fetch.cgi b/updown/fetch.cgi
index bfa00c11a..2f1b57692 100755
--- a/updown/fetch.cgi
+++ b/updown/fetch.cgi
@@ -40,8 +40,10 @@ if ($ENV{'PATH_INFO'}) {
 	if (-d $file) {
 		# Zip up the whole directory
 		($shortfile = $file) =~ s/^.*\///g;
+		$shortfile =~ s/\s+//g;
 		$temp = &transname($shortfile.".zip");
-		$out = &backquote_command("cd ".quotemeta($file)." && zip -r $temp .");
+		$out = &backquote_command("cd ".quotemeta($file).
+					  " && zip -r ".quotemeta($temp)." .");
 		if ($?) {
 			&error(&text('fetch_ezipcmd',
 				     "<tt>".&html_escape($out)."</tt>"));