diff --git a/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch b/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
new file mode 100644
index 0000000..e3e1ccc
--- /dev/null
+++ b/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
@@ -0,0 +1,27 @@
+From df1f875e27730fe2b10812b585f3e6bbc5502d8f Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sun, 12 May 2013 16:27:12 +0100
+Subject: [PATCH] libbtrfs: Set SONAME to "libbtrfs.so.0" (instead of
+ "libbtrfs.so").
+
+Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 9c195b3..d2c2e28 100644
+--- a/Makefile
++++ b/Makefile
+@@ -93,7 +93,7 @@ version.h:
+ 
+ $(libs_shared): $(libbtrfs_objects) $(lib_links) send.h
+ 	@echo "    [LD]     $@"
+-	$(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(lib_LIBS) -shared -Wl,-soname,libbtrfs.so -o libbtrfs.so.0.1
++	$(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(lib_LIBS) -shared -Wl,-soname,libbtrfs.so.0 -o libbtrfs.so.0.1
+ 
+ $(libs_static): $(libbtrfs_objects)
+ 	@echo "    [AR]     $@"
+-- 
+1.8.1.4
+
diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index c2f8639..07121ef 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,6 +1,6 @@
 Name:		btrfs-progs
 Version:	0.20.rc1.20130501git7854c8b
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Userspace programs for btrfs
 
 Group:		System Environment/Base
@@ -14,6 +14,10 @@ Patch0:		btrfs-progs-valgrind.patch
 Patch1:		btrfs-init-dev-list.patch
 Patch2:		btrfs-progs-Makefile.patch
 
+# Patch accepted upstream 2013-05-13:
+# http://permalink.gmane.org/gmane.comp.file-systems.btrfs/25681
+Patch3:         0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	e2fsprogs-devel, libuuid-devel, zlib-devel
@@ -41,6 +45,7 @@ btrfs filesystem-specific programs.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?_smp_mflags}
@@ -84,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libbtrfs.so
 
 %changelog
+* Mon May 13 2013 Richard W.M. Jones <rjones@redhat.com> 0.20.rc1.20130501git7854c8b-3
+- Add accepted upstream patch to fix SONAME libbtrfs.so -> libbtrfs.so.0
+
 * Thu May 02 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20130501git7854c8b-2
 - Fix subpackage brokenness