diff --git a/0001-rpm-Use-tab-instead-of-space-so-we-don-t-get-confuse.patch b/0001-rpm-Use-tab-instead-of-space-so-we-don-t-get-confuse.patch
new file mode 100644
index 0000000..c856d8d
--- /dev/null
+++ b/0001-rpm-Use-tab-instead-of-space-so-we-don-t-get-confuse.patch
@@ -0,0 +1,34 @@
+From 35f49bde1c72ae4aed7116171df3f88d5696debf Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Wed, 21 May 2014 12:41:58 +0100
+Subject: [PATCH] rpm: Use tab instead of space so we don't get confused by
+ filenames containing spaces (RHBZ#1099862).
+
+Thanks: Lee Yarwood
+---
+ src/rpm.ml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rpm.ml b/src/rpm.ml
+index b08c60c..adb5c89 100644
+--- a/src/rpm.ml
++++ b/src/rpm.ml
+@@ -212,13 +212,13 @@ let rpm_get_all_requires pkgs =
+ 
+ let rpm_get_all_files pkgs =
+   let cmd = sprintf "\
+-      %s -q --qf '[%%{FILENAMES} %%{FILEFLAGS:fflags}\\n]' %s |
++      %s -q --qf '[%%{FILENAMES}\\t%%{FILEFLAGS:fflags}\\n]' %s |
+       grep '^/' |
+       sort -u"
+     Config.rpm
+     (quoted_list (List.map rpm_package_to_string (PackageSet.elements pkgs))) in
+   let lines = run_command_get_lines cmd in
+-  let lines = List.map (string_split " ") lines in
++  let lines = List.map (string_split "\t") lines in
+   List.map (
+     function
+     | [ path; flags ] ->
+-- 
+1.9.0
+
diff --git a/supermin.spec b/supermin.spec
index c01ee0f..b76ef4b 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -1,7 +1,7 @@
 Summary:       Tool for creating supermin appliances
 Name:          supermin
 Version:       5.1.8
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       GPLv2+
 
 %if 0%{?rhel} >= 7
@@ -14,6 +14,9 @@ Source0:       http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
 # Upstream patch to allow us to skip the execstack test.
 Patch0001:     0001-Make-test-execstack-recognize-SKIP_-variable.patch
 
+# Upstream patch to fix RPM handler when filenames may contain spaces.
+Patch0002:     0001-rpm-Use-tab-instead-of-space-so-we-don-t-get-confuse.patch
+
 BuildRequires: /usr/bin/pod2man
 BuildRequires: rpm
 BuildRequires: yum-utils
@@ -53,6 +56,7 @@ second when you need to boot one of them.
 %prep
 %setup -q
 %patch0001 -p1
+%patch0002 -p1
 
 
 %build
@@ -86,6 +90,9 @@ make check || {
 
 
 %changelog
+* Wed May 21 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.8-5
+- Add patch to fix RPM handler when filenames may contain spaces.
+
 * Mon May 19 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.8-4
 - Skip execstack test on Fedora 20 (ARM only).