diff --git a/.gitignore b/.gitignore
index 9156191..2770440 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,3 +117,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.15.1.tar.gz
 /libguestfs-1.15.2.tar.gz
 /libguestfs-1.15.3.tar.gz
+/libguestfs-1.15.4.tar.gz
diff --git a/0001-df-Disable-part-of-virt-df-test.patch b/0001-df-Disable-part-of-virt-df-test.patch
deleted file mode 100644
index 39ffd21..0000000
--- a/0001-df-Disable-part-of-virt-df-test.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1c077fba9a690074d9df378afaf3165a06f229c1 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 11 Nov 2011 13:30:09 +0000
-Subject: [PATCH] df: Disable part of virt-df test.
-
-See:
-https://www.redhat.com/archives/libguestfs/2011-November/msg00051.html
----
- df/test-virt-df.sh |   18 ++++++++++--------
- 1 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/df/test-virt-df.sh b/df/test-virt-df.sh
-index 6878327..38884e1 100755
---- a/df/test-virt-df.sh
-+++ b/df/test-virt-df.sh
-@@ -61,12 +61,14 @@ fi
- # /dev/dm-2                31729       395     29696   2% /sysroot/lv2
- # /dev/dm-3                63472       144     60052   1% /sysroot/lv3
- #
--# Only test plain 'df' output at the moment (XXX).
-+# This test is disabled (XXX).  See:
-+# https://www.redhat.com/archives/libguestfs/2011-November/msg00051.html
- 
--if [ "$(echo "$output" | sort | awk '/VG.LV[123]/ { print $2 " " $3 " " $4 " " $5 }')" != \
--"31728 28 30064 1%
--31729 395 29696 2%
--63472 144 60052 1%" ]; then
--    echo "$0: error: output of virt-df did not match expected (df) output"
--    exit 1
--fi
-+#if [ "$(echo "$output" | sort | awk '/VG.LV[123]/ { print $2 " " $3 " " $4 " " $5 }')" != \
-+#"31728 28 30064 1%
-+#31729 395 29696 2%
-+#63472 144 60052 1%" ]; then
-+#    echo "$0: error: output of virt-df did not match expected (df) output"
-+#    echo "$output"
-+#    exit 1
-+#fi
--- 
-1.7.6
-
diff --git a/libguestfs.spec b/libguestfs.spec
index 5c508d8..63d232e 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -29,8 +29,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.15.3
-Release:       3%{?dist}
+Version:       1.15.4
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -232,9 +232,6 @@ Source3:       99-guestfsd.rules
 # Replacement README file for Fedora users.
 Source4:       README-replacement.in
 
-# Upstream patch to disable part of virt-df test.
-Patch0:        0001-df-Disable-part-of-virt-df-test.patch
-
 
 %description
 Libguestfs is a library for accessing and modifying guest disk images.
@@ -585,8 +582,6 @@ for %{name}.
 %prep
 %setup -q
 
-%patch0 -p1
-
 mkdir -p daemon/m4
 
 # Replace developer-specific README that ships with libguestfs, with
@@ -962,6 +957,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 17 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.4-1
+- New upstream version 1.15.4.
+- Remove patch which is now upstream.
+
 * Fri Nov 11 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.3-3
 - Add upstream patch to disable part of virt-df test.
 
diff --git a/sources b/sources
index 485a086..441b193 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53a3d3a3cf08141a4919e2423484535f  libguestfs-1.15.3.tar.gz
+7eb944f0efe5b5e7a04c40f58851793a  libguestfs-1.15.4.tar.gz