diff --git a/0001-tests-virt-make-fs-Allow-btrfs-to-be-skipped.patch b/0001-tests-virt-make-fs-Allow-btrfs-to-be-skipped.patch
deleted file mode 100644
index 2e76976..0000000
--- a/0001-tests-virt-make-fs-Allow-btrfs-to-be-skipped.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e18e20793f12745e96cc28eedd85e3118f8e20e7 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 21 Jan 2013 08:15:54 +0000
-Subject: [PATCH] tests: virt-make-fs: Allow btrfs to be skipped.
-
----
- tools/test-virt-make-fs.sh | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tools/test-virt-make-fs.sh b/tools/test-virt-make-fs.sh
-index 80ee4bb..316d959 100755
---- a/tools/test-virt-make-fs.sh
-+++ b/tools/test-virt-make-fs.sh
-@@ -32,6 +32,11 @@ perl -MSys::Guestfs '-MSys::Guestfs::Lib qw(feature_available)' -e '
-   feature_available ($g, "btrfs") and print "btrfs_available=yes\n";
- ')
- 
-+# Allow btrfs to be disabled when btrfs is broken (eg. RHBZ#863978).
-+if [ -n "$SKIP_TEST_VIRT_MAKE_FS_BTRFS" ]; then
-+    btrfs_available=
-+fi
-+
- declare -a choices
- 
- # Return a random element from the array 'choices'.
--- 
-1.8.1
-
diff --git a/libguestfs.spec b/libguestfs.spec
index 173e149..7933775 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -21,8 +21,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.21.4
-Release:       3%{?dist}
+Version:       1.21.5
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -33,9 +33,6 @@ Patch1:        ruby-1.9-vendor-not-site.patch
 BuildRequires: autoconf, automake, libtool, gettext-devel
 %endif
 
-# Upstream patch to let us skip btrfs testing.
-Patch2:        0001-tests-virt-make-fs-Allow-btrfs-to-be-skipped.patch
-
 # Basic build requirements:
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -683,8 +680,6 @@ fi
 autoreconf -i
 %endif
 
-%patch2 -p1
-
 mkdir -p daemon/m4
 
 # Replace developer-centric README that ships with libguestfs, with
@@ -1027,6 +1022,10 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
+* Mon Jan 21 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.5-1
+- New development version 1.21.5.
+- Remove upstream patch.
+
 * Mon Jan 21 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.4-3
 - Add upstream patch to allow btrfs tests to be skipped.
 - Skip btrfs tests because btrfs has been broken forever (RHBZ#863978). 
diff --git a/sources b/sources
index 44cff5f..83d94e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ea4ea22e531f46e30d29626b30c773a  libguestfs-1.21.4.tar.gz
+63bf8c57ffa2683843956f0d5c356c54  libguestfs-1.21.5.tar.gz