diff --git a/0001-appliance-Fedora-cryptsetup-luks-renamed-to-cryptset.patch b/0001-appliance-Fedora-cryptsetup-luks-renamed-to-cryptset.patch
new file mode 100644
index 0000000..cdcfbae
--- /dev/null
+++ b/0001-appliance-Fedora-cryptsetup-luks-renamed-to-cryptset.patch
@@ -0,0 +1,27 @@
+From af0c123be8cc62acf9e1368b1d00acccdd6d91e9 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 14 Oct 2011 22:08:20 +0100
+Subject: [PATCH] appliance: Fedora cryptsetup-luks renamed to cryptsetup.
+
+Therefore we need both names to be listed in the file.
+---
+ appliance/packagelist.in |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/appliance/packagelist.in b/appliance/packagelist.in
+index 731ee7d..f8f2642 100644
+--- a/appliance/packagelist.in
++++ b/appliance/packagelist.in
+@@ -21,7 +21,8 @@
+ #ifdef REDHAT
+   augeas-libs
+   btrfs-progs
+-  cryptsetup-luks
++  cryptsetup
++  cryptsetup-luks /* old name used before Fedora 17 */
+   diffutils
+   e2fsprogs
+   /* e4fsprogs only exists on RHEL 5, will be ignored everywhere else. */
+-- 
+1.7.6
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 388a28b..e196468 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.13.21
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -49,6 +49,9 @@ Patch2:        libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
 # while.
 Patch3:        0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
 
+# Upstream patch to rename cryptsetup-luks to cryptsetup.
+Patch4:        0001-appliance-Fedora-cryptsetup-luks-renamed-to-cryptset.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -524,6 +527,7 @@ for %{name}.
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 mkdir -p daemon/m4
 
@@ -900,7 +904,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 14 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.21-1
+* Fri Oct 14 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.13.21-2
 - New upstream version 1.13.21.
 - Move virt-sysprep to libguestfs-tools, to avoid pulling in extra
   dependencies for RHEV-H.  This tool is not likely to be useful