diff --git a/debian/changelog b/debian/changelog
index a4d4d67..ef8f2d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+alien (6.56) unstable; urgency=low
+
+  * Corrected a problem triggered by wordperfect's deb: rpm can't deal with
+    files that have spaces, unless they are quoted. Thus, quote all filenames.
+  * Handles empty directories now when converting to rpm.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 20 Jan 2000 16:25:27 -0800
+
 alien (6.55) unstable; urgency=low
 
   * Patch from Jan Nieuwenhuizen to fix control file extraction on
diff --git a/lib/Torpm.pm b/lib/Torpm.pm
index ed95fb0..65411b6 100644
--- a/lib/Torpm.pm
+++ b/lib/Torpm.pm
@@ -54,9 +54,15 @@ sub Convert { my ($self,$workdir,$nopatch,%fields)=@_;
 				$filelist.="%config $fn\n";
 			}
 			else { # normal file
-				$filelist.="$fn\n";
+				# Filename must be quoted so rpm can handle
+				# spaces.
+				$filelist.="\"$fn\"\n";
 			}
 		}
+		else {
+			# Add directories too.
+			$filelist.="%dir \"$fn\"\n";
+		}
 	}
 	$fields{FILELIST}=$filelist;