diff --git a/srcpkgs/btrfs-progs/files/btrfs.initramfs-local-top b/srcpkgs/btrfs-progs/files/btrfs.initramfs-local-top
index e6538cf314..d224cf4591 100644
--- a/srcpkgs/btrfs-progs/files/btrfs.initramfs-local-top
+++ b/srcpkgs/btrfs-progs/files/btrfs.initramfs-local-top
@@ -15,7 +15,4 @@ prereqs)
 esac
 
 # Activate btrfs multi-volumes.
-. /scripts/functions
-
-_log_msg "Activating btrfs multi-volumes..."
-/sbin/btrfs device scan
+/sbin/btrfs device scan 2>/dev/null
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 3b1b5a4e9f..8e6aef9c47 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -4,6 +4,7 @@ _distver=0.19
 _snapver=20120328
 version="${_snapver}.${_distver}"
 wrksrc="${pkgname}-${_distver}.${_snapver}"
+revision=1
 homepage="http://btrfs.wiki.kernel.org/"
 distfiles="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-${_distver}.${_snapver}.tar.xz"
 short_desc="Btrfs filesystem utilities"
@@ -19,7 +20,7 @@ Add_dependency build libuuid-devel
 Add_dependency build e2fsprogs-devel
 
 do_build() {
-	make ${makejobs}
+	make CFLAGS="${CFLAGS}" ${makejobs}
 }
 
 do_install() {