diff --git a/.btrfs-progs.metadata b/.btrfs-progs.metadata
index 964d617..3667144 100644
--- a/.btrfs-progs.metadata
+++ b/.btrfs-progs.metadata
@@ -1 +1 @@
-8aa868288cb8b09b881825ca341cebf420037a5e SOURCES/btrfs-progs-0.20.rc1.20130917git194aa4a.tar.bz2
+a9067bf56680937f9cea77a15a0e06500f94a935 SOURCES/btrfs-progs-v3.12.tar.xz
diff --git a/SOURCES/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch b/SOURCES/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
deleted file mode 100644
index 75d8310..0000000
--- a/SOURCES/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 da7438e..0446836 100644
---- a/Makefile
-+++ b/Makefile
-@@ -100,7 +100,7 @@ version.h:
- $(libs_shared): $(libbtrfs_objects) $(lib_links) send.h
- 	@echo "    [LD]     $@"
- 	$(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(LDFLAGS) $(lib_LIBS) \
--		-shared -Wl,-soname,libbtrfs.so -o libbtrfs.so.0.1
-+		-shared -Wl,-soname,libbtrfs.so.0 -o libbtrfs.so.0.1
- 
- $(libs_static): $(libbtrfs_objects)
- 	@echo "    [AR]     $@"
-
-
diff --git a/SOURCES/btrfs-progs-Makefile.patch b/SOURCES/btrfs-progs-Makefile.patch
deleted file mode 100644
index c80ebaa..0000000
--- a/SOURCES/btrfs-progs-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: btrfs-progs-0.20.rc1.20130501git7854c8b/Makefile
-===================================================================
---- btrfs-progs-0.20.rc1.20130501git7854c8b.orig/Makefile
-+++ btrfs-progs-0.20.rc1.20130501git7854c8b/Makefile
-@@ -222,6 +222,8 @@ clean :
- install: $(libs) $(progs) install-man
- 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
- 	$(INSTALL) $(progs) $(DESTDIR)$(bindir)
-+	# make btrfsck a link again under $(DESTDIR)
-+	$(LN) -f $(DESTDIR)$(bindir)/btrfs $(DESTDIR)$(bindir)/btrfsck
- 	$(INSTALL) -m755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL) $(libs) $(DESTDIR)$(libdir)
- 	cp -a $(lib_links) $(DESTDIR)$(libdir)
diff --git a/SPECS/btrfs-progs.spec b/SPECS/btrfs-progs.spec
index 5210350..01c8436 100644
--- a/SPECS/btrfs-progs.spec
+++ b/SPECS/btrfs-progs.spec
@@ -1,22 +1,17 @@
 Name:		btrfs-progs
-Version:	0.20.rc1.20130917git194aa4a
-Release:	1%{?dist}
+Version:	3.12
+Release:	4%{?dist}
 Summary:	Userspace programs for btrfs
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://btrfs.wiki.kernel.org/index.php/Main_Page
-Source0:	%{name}-%{version}.tar.bz2
+Source0:	https://www.kernel.org/pub/linux/kernel/people/mason/%{name}/%{name}-v%{version}.tar.xz
 
 # Valgrind patch no longer applied, but kept for posterity
 # Still must reverse-engineer fixes in there and get upstream
 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)
 
@@ -42,10 +37,8 @@ You should install btrfs-progs-devel if you want to develop
 btrfs filesystem-specific programs.
 
 %prep
-%setup -q
+%setup -q -n %{name}-v%{version}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?_smp_mflags}
@@ -78,12 +71,31 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/btrfsck.8.gz
 %{_mandir}/man8/mkfs.btrfs.8.gz
 %{_mandir}/man8/btrfs.8.gz
+%{_mandir}/man8/btrfs-convert.8.gz
+%{_mandir}/man8/btrfs-debug-tree.8.gz
+%{_mandir}/man8/btrfs-find-root.8.gz
+%{_mandir}/man8/btrfs-map-logical.8.gz
+%{_mandir}/man8/btrfs-show-super.8.gz
+%{_mandir}/man8/btrfs-zero-log.8.gz
+%{_mandir}/man8/btrfstune.8.gz
 
 %files devel
 %{_includedir}/*
 %{_libdir}/libbtrfs.so
 
 %changelog
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 3.12-4
+- Mass rebuild 2014-01-24
+
+* Mon Jan 20 2014 Eric Sandeen <sandeen@redhat.com> 3.12-3
+- Fix Source0 URL, switch to .xz
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 3.12-2
+- Mass rebuild 2013-12-27
+
+* Fri Dec 06 2013 Eric Sandeen <sandeen@redhat.com> 3.12-1
+- Rebase to new upstream release (#1034904)
+
 * Tue Sep 17 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20130917git194aa4a-1
 - New upstream snapshot
 - Deprecated btrfsctl, btrfs-show, and btrfs-vol; still available in btrfs cmd