diff --git a/guestfs-daemon-find.patch b/guestfs-daemon-find.patch
new file mode 100644
index 0000000..9c1e00e
--- /dev/null
+++ b/guestfs-daemon-find.patch
@@ -0,0 +1,17 @@
+diff --git a/daemon/find.c b/daemon/find.c
+index a873bca..287aae3 100644
+--- a/daemon/find.c
++++ b/daemon/find.c
+@@ -113,7 +113,11 @@ do_find (char *dir)
+       return NULL;
+     }
+   }
+-  pclose (fp);
++  if (pclose (fp) == -1) {
++    reply_with_perror ("pclose: find");
++    free_stringslen (res, size);
++    return NULL;
++  }
+ 
+   if (r == -1) {
+     free_stringslen (res, size);
diff --git a/libguestfs.spec b/libguestfs.spec
index 6286c21..81ad228 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -4,13 +4,16 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Version:     1.0.49
-Release:     3%{?dist}
+Release:     4%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
 Source0:     http://libguestfs.org/download/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
+# Upstream: 3c5b447efd42b03c24104bdc1f3260e879bb1d25
+Patch0:      guestfs-daemon-find.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -249,6 +252,8 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
+%patch0 -p1
+
 mkdir -p daemon/m4
 
 # Rerun the generator to make sure all files are up to date.
@@ -493,8 +498,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Jun 20 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.49-3
+* Sat Jun 20 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.49-4
 - Remove workaround for RHBZ#507007, since bug is now fixed.
+- Pull in upstream patch to fix pclose checking
+  (testing as possible fix for RHBZ#507066).
 
 * Fri Jun 19 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.49-2
 - New upstream release 1.0.49.