diff --git a/common/shlibs b/common/shlibs
index 427781bf03..faf9aecf63 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1438,3 +1438,4 @@ libjbig2dec.so.0 libjbig2dec-0.11_1
 libsource-highlight.so.4 libsource-highlight-3.1.7_1
 libvlc.so.5 libvlc-2.1.1_2
 libvlccore.so.7 libvlc-2.1.1_2
+libbtrfs.so.0 libbtrfs-3.12_1
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 8e9fd61705..8d5e8dcc14 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,16 +1,16 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-_distver=0.20-rc1.1
-version=0.20rc1.1
+version=3.12
 revision=1
-wrksrc="${pkgname}-${_distver}"
-makedepends="acl-devel libuuid-devel e2fsprogs-devel"
+makedepends="zlib-devel lzo-devel acl-devel libuuid-devel e2fsprogs-devel"
 short_desc="Btrfs filesystem utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://btrfs.wiki.kernel.org/"
-distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${_distver}.tar.xz"
-checksum=6d13ffd167ee1cc1a8844f7c656db0472730a3bb8fa561e9361957b1ec502f2b
+
+do_fetch() {
+	git clone -b v${version} git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git ${pkgname}-${version}
+}
 
 do_build() {
 	make CC="$CC" CFLAGS="$CFLAGS" ${makejobs}
@@ -20,8 +20,25 @@ do_install() {
 	make prefix=${DESTDIR}/usr mandir=${DESTDIR}/usr/share/man install
 }
 
-btrfs-progs_package() {
+libbtrfs_package() {
+	short_desc+=" - runtime library"
 	pkg_install() {
-		vmove usr
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libbtrfs-devel_package() {
+	short_desc+=" - development files"
+	depends="libbtrfs>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
+
+btrfs-progs_package() {
+	pkg_install() {
+		vmove all
 	}
 }
diff --git a/srcpkgs/libbtrfs b/srcpkgs/libbtrfs
new file mode 120000
index 0000000000..03c9921434
--- /dev/null
+++ b/srcpkgs/libbtrfs
@@ -0,0 +1 @@
+btrfs-progs
\ No newline at end of file
diff --git a/srcpkgs/libbtrfs-devel b/srcpkgs/libbtrfs-devel
new file mode 120000
index 0000000000..03c9921434
--- /dev/null
+++ b/srcpkgs/libbtrfs-devel
@@ -0,0 +1 @@
+btrfs-progs
\ No newline at end of file