diff --git a/srcpkgs/btrfs-progs/btrfs-progs.rshlibs b/srcpkgs/btrfs-progs/btrfs-progs.rshlibs
index d0dcd0e300f..d3f08798fa4 100644
--- a/srcpkgs/btrfs-progs/btrfs-progs.rshlibs
+++ b/srcpkgs/btrfs-progs/btrfs-progs.rshlibs
@@ -1,2 +1,6 @@
 libuuid.so.1
 libc.so.6
+libpthread.so.0
+libz.so.1
+libext2fs.so.2
+libcom_err.so.2
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 3b23fe0d2f0..3b1b5a4e9f3 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,16 +1,37 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=20101110
-distfiles="http://xbps.nopcode.org/distfiles/$pkgname-$version.tar.gz"
-build_style=gnu-makefile
-make_build_args="CFLAGS=-Wno-error"
-make_install_args="prefix=/usr bindir=/sbin mandir=/usr/share/man"
-revision=1
+_distver=0.19
+_snapver=20120328
+version="${_snapver}.${_distver}"
+wrksrc="${pkgname}-${_distver}.${_snapver}"
+homepage="http://btrfs.wiki.kernel.org/"
+distfiles="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-${_distver}.${_snapver}.tar.xz"
 short_desc="Btrfs filesystem utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=70683c522931eb8b96a68950cc9d95e64d6e350488f2797ca1c2be32bd32f902
+license="GPL-2"
+checksum=0c6dbd3df81429e7489b74d5780ffdbe1e46495d155123a7f13dff0d491570e2
 long_desc="
  This packages provides the userspace utilities required to
  create/format/manipulate Btrfs filesystems."
 
+Add_dependency build acl-devel
 Add_dependency build libuuid-devel
+Add_dependency build e2fsprogs-devel
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	make prefix=${DESTDIR}/usr install
+
+	# fix manpage location.
+	vmkdir usr/share
+	vmove usr/man usr/share
+
+	# Install initramfs-tools stuff.
+	vinstall ${FILESDIR}/btrfs.initramfs-hook \
+		755 usr/share/initramfs-tools/hooks btrfs
+	vinstall ${FILESDIR}/btrfs.initramfs-local-top \
+		755 usr/share/initramfs-tools/scripts/local-top btrfs
+}