diff --git a/libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch b/libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch
new file mode 100644
index 0000000..852baf2
--- /dev/null
+++ b/libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch
@@ -0,0 +1,63 @@
+From: Richard Jones <rjones@redhat.com>
+Date: Fri, 12 Mar 2010 15:10:28 +0000 (+0000)
+Subject: Special case hostfiles handling for libntfs-3g.so
+X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=599f94c9c14c970dcfd7cec8d6898cd3b46af8ca
+
+Special case hostfiles handling for libntfs-3g.so
+
+The ntfs-3g project keeps bumping their soname, and this causes
+dependency problems for the Fedora package.  The root of the problem
+is we depend on /lib/libntfs-3g.so.<N>, but if <N> keeps bumping,
+the dependency keeps breaking.
+
+This commit changes the hostfiles (and hence dependency) to be on
+/lib/libntfs-3g.so.* instead.  The downside to this is we could end
+up pulling more files into the appliance than are strictly required,
+but it will fix the Fedora packaging problems being felt by the
+Fedora maintainer of ntfs-3g.
+
+After applying this commit, the change to hostfiles looks like this:
+
+@@ -1489,7 +1489,7 @@
+ ./lib/libpam_misc.so.0
+ ./lib/libdmraid.so
+ ./lib/libidn.so.11
+-./lib/libntfs-3g.so.74
++./lib/libntfs-3g.so.*
+ ./lib/libext2fs.so.2.*
+ ./lib/libpam.so.0
+ ./lib/libsepol.so.1
+@@ -1520,7 +1520,6 @@
+ ./lib/libnss_files-*.so
+ ./lib/libgio-2.0.so.0
+ ./lib/libpam_misc.so.0.*
+-./lib/libntfs-3g.so.74.*
+ ./lib/libanl.so.1
+ ./lib/libdevmapper-event-lvm2.so.2.*
+ ./lib/libpthread.so.0
+---
+
+diff --git a/appliance/supermin-split.sh.in b/appliance/supermin-split.sh.in
+index cd29b8a..94990dd 100755
+--- a/appliance/supermin-split.sh.in
++++ b/appliance/supermin-split.sh.in
+@@ -63,6 +63,7 @@ for path in $(find -not -name fakeroot.log); do
+     p_ld_so='^ld-[.0-9]+\.so$'
+     p_libbfd='^libbfd-.*\.so$'
+     p_libgcc='^libgcc_s-.*\.so\.([0-9]+)$'
++    p_libntfs3g='^libntfs-3g\.so\..*$'
+     p_lib123so='^lib(.*)-[-.0-9]+\.so$'
+     p_lib123so123='^lib(.*)-[-.0-9]+\.so\.([0-9]+)\.'
+     p_libso123='^lib(.*)\.so\.([0-9]+)\.'
+@@ -104,6 +105,11 @@ for path in $(find -not -name fakeroot.log); do
+     elif [[ "$file" =~ $p_libgcc ]]; then
+         echo "$dir/libgcc_s-*.so.${BASH_REMATCH[1]}" >&6
+ 
++    # Special case for libntfs-3g.so.*
++    elif [[ "$file" =~ $p_libntfs3g ]]; then
++	[ -n "$libntfs3g_once" ] || echo "$dir/libntfs-3g.so.*" >&6
++	libntfs3g_once=1
++
+     # libfoo-1.2.3.so
+     elif [[ "$file" =~ $p_lib123so ]]; then
+         echo "$dir/lib${BASH_REMATCH[1]}-*.so" >&6
diff --git a/libguestfs.spec b/libguestfs.spec
index cf95ef4..00f8422 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -42,7 +42,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.0.85
-Release:       1%{?dist}.2
+Release:       1%{?dist}.3
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -55,6 +55,9 @@ Patch0:        libguestfs-1.0.79-no-fuse-test.patch
 # More complete fix for bash regexp quoting screw-up.
 Patch1:        libguestfs-1.0.85-bash-regexp-quoting-fix-for-rhel-5.patch
 
+# Backport upstream commit to weaken dependency on libntfs-3g.so.N.
+Patch2:        libguestfs-1.0.85-weaken-dependency-on-libntfs-3g.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -378,6 +381,7 @@ Requires:      jpackage-utils
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 mkdir -p daemon/m4
 
@@ -650,6 +654,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 12 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-1.fc12.3
+- Backport upstream patch to remove dependency on /lib/libntfs-3g.so.N.
+
 * Tue Mar  2 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.85-1.fc12.2
 - Tests on i386 fail because of RHBZ#502074.
 - Run tests only on x86_64.