diff --git a/0001-build-Another-corner-case-in-munge-function.patch b/0001-build-Another-corner-case-in-munge-function.patch
new file mode 100644
index 0000000..486fe6b
--- /dev/null
+++ b/0001-build-Another-corner-case-in-munge-function.patch
@@ -0,0 +1,33 @@
+From 42bca7636dadc2ae5ceed47327cc65e772a81834 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sun, 3 Aug 2014 17:15:42 +0100
+Subject: [PATCH] build: Another corner case in munge function.
+
+In Rawhide, /media is now a pointer to /run/media which does
+not exist.
+
+This caused us to loop indefinitely in the final case, calling
+
+  loop ("/" :: "/media" :: rest)
+
+because "/" was never marked as "seen".  Marking it as seen was the
+simplest way to break this loop.
+---
+ src/build.ml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/build.ml b/src/build.ml
+index 2a28a3f..8ff574b 100644
+--- a/src/build.ml
++++ b/src/build.ml
+@@ -376,6 +376,7 @@ and munge files =
+ 
+     | { ft_path = "/" } :: rest ->
+       (* This is just to avoid a corner-case in subsequent rules. *)
++      insert_dir "/";
+       loop rest
+ 
+     | dir :: rest when stat_is_dir dir.ft_path && dir_seen dir.ft_path ->
+-- 
+2.0.4
+
diff --git a/supermin.spec b/supermin.spec
index 570e6ac..b8b50c3 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -1,7 +1,7 @@
 Summary:       Tool for creating supermin appliances
 Name:          supermin
 Version:       5.1.9
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       GPLv2+
 
 %if 0%{?rhel} >= 7
@@ -11,6 +11,9 @@ ExclusiveArch: x86_64
 URL:           http://people.redhat.com/~rjones/supermin/
 Source0:       http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
 
+# Upstream patch which avoids endless loop in Rawhide.
+Patch1:        0001-build-Another-corner-case-in-munge-function.patch
+
 BuildRequires: /usr/bin/pod2man
 BuildRequires: rpm
 BuildRequires: yum-utils
@@ -52,6 +55,8 @@ second when you need to boot one of them.
 %prep
 %setup -q
 
+%patch1 -p1
+
 
 %build
 %configure --disable-network-tests
@@ -84,6 +89,9 @@ make check || {
 
 
 %changelog
+* Sun Aug  3 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.9-2
+- Add upstream patch to avoid endless loop in Rawhide.
+
 * Mon Jul 21 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.9-1
 - New upstream version 5.1.9.
 - Remove patches which are now upstream.