diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 758c5c66912..218ef786885 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,14 +1,15 @@
 # Template file for 'xbps'
 pkgname=xbps
-version=0.14
+version=0.15
 distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz"
 build_style=configure
-configure_args="--prefix=/ --exec-prefix=/usr --with-pie"
+configure_args="--prefix=/ --exec-prefix=/usr --with-pie --sbindir=/usr/sbin
+--with-tests"
 short_desc="The XBPS package system utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
 license="Simplified BSD"
-checksum=e15ba5839a093ea3d523e9c2dca20446d0db68c64a7901ff7258652579496029
+checksum=83a6ab893b309dbbdcb56e0fa8c7dfd426d3e408ccf202d14bba6db1a28b41e0
 long_desc="
  The XBPS package system. A new, fast, from scratch and simple
  binary package manager. This package includes the binary utilities
@@ -28,3 +29,4 @@ Add_dependency build openssl-devel
 Add_dependency build libfetch-devel
 Add_dependency build libarchive-devel
 Add_dependency build confuse-devel
+Add_dependency build atf-devel
diff --git a/srcpkgs/xbps/xbps-static.template b/srcpkgs/xbps/xbps-static.template
index 7aea1ab571f..99293687a82 100644
--- a/srcpkgs/xbps/xbps-static.template
+++ b/srcpkgs/xbps/xbps-static.template
@@ -11,7 +11,7 @@ Add_dependency run xbps-triggers
 
 do_install() {
 	vmove usr/include usr
-	vmove "sbin/*.static" sbin
+	vmove "usr/sbin/*.static" usr/sbin
 	vmove "usr/lib/*.a" usr/lib
 	vmove usr/lib/pkgconfig usr/lib
 }