diff --git a/.gitignore b/.gitignore
index d94314d..401f694 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.17.2.tar.gz
 /libguestfs-1.17.3.tar.gz
 /libguestfs-1.17.4.tar.gz
+/libguestfs-1.17.5.tar.gz
diff --git a/0001-Workaround-for-usrmove-in-Fedora.patch b/0001-Workaround-for-usrmove-in-Fedora.patch
deleted file mode 100644
index f957b00..0000000
--- a/0001-Workaround-for-usrmove-in-Fedora.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3ddd9e33fd2c6c75b10d1734d8cdd821ea356863 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sun, 5 Feb 2012 22:53:07 +0000
-Subject: [PATCH] Workaround for usrmove in Fedora.
-
----
- appliance/Makefile.am |    9 +++++----
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index 99896be..0d6b871 100644
---- a/appliance/Makefile.am
-+++ b/appliance/Makefile.am
-@@ -67,10 +67,11 @@ stamp-supermin: make.sh packagelist excludelist
- supermin.d/daemon.img: ../daemon/guestfsd
- 	mkdir -p supermin.d
- 	rm -f $@ $@-t
--	mkdir sbin
--	cd sbin && ln ../../daemon/guestfsd
--	echo -e "sbin\nsbin/guestfsd" | cpio --quiet -o -H newc > $@-t
--	rm -r sbin
-+	mkdir -p usr/sbin
-+	cd usr/sbin && ln ../../../daemon/guestfsd
-+	echo -e "usr\nusr/sbin\nusr/sbin/guestfsd" | \
-+	  cpio --quiet -o -H newc > $@-t
-+	rm -r usr
- 	mv $@-t $@
- 
- supermin.d/init.img: init
--- 
-1.7.9
-
diff --git a/libguestfs.spec b/libguestfs.spec
index 32ac826..04d4c7b 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.17.4
-Release:       8%{?dist}
+Version:       1.17.5
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -38,7 +38,6 @@ Source0:       http://libguestfs.org/download/1.17-development/%{name}-%{version
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %if 0%{?fedora} >= 17
-Patch0:        0001-Workaround-for-usrmove-in-Fedora.patch
 Patch1:        ruby-1.9-vendor-not-site.patch
 BuildRequires: autoconf, automake, libtool, gettext-devel
 %endif
@@ -628,7 +627,6 @@ for %{name}.
 %setup -q
 
 %if 0%{?fedora} >= 17
-%patch0 -p1
 %patch1 -p1
 autoreconf -i
 %endif
@@ -1031,6 +1029,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb  8 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.5-1
+- New upstream version 1.17.5.
+- Remove usrmove workaround patch, now upstream.
+
 * Wed Feb  8 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.4-8
 - Further Ruby 1.9 changes.
 
diff --git a/sources b/sources
index b2ad220..4e657ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6d1ee09fe1508956ff8117b743f7b92  libguestfs-1.17.4.tar.gz
+0aa3e0a895d64b7e08d05ce7f475277a  libguestfs-1.17.5.tar.gz