diff --git a/srcpkgs/xbps-static b/srcpkgs/xbps-static
new file mode 120000
index 0000000000..9274d81bf0
--- /dev/null
+++ b/srcpkgs/xbps-static
@@ -0,0 +1 @@
+xbps
\ No newline at end of file
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 12badeb19c..c9ff1b68b8 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,18 +1,30 @@
 # Template file for 'xbps'
 pkgname=xbps
-version=0.2
+version=0.3
 distfiles="http://launchpad.net/xbps/head/$version/+download/xbps-$version.tar.gz"
 build_style=gnu_makefile
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX= install"
-short_desc="The XBPS package system"
+make_build_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX="
+make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version PREFIX="
+short_desc="The XBPS package system utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=1c68380ccfa163713bb19661b9e50219daa0972ba55c1973fffb7035898154d8
+checksum=ba9b1964779c78351241a71dc11f5c5a7323c53dd9387adce261cf1d0eb241cf
 long_desc="
  The XBPS package system. A new, fast, from scratch and simple
- binary package manager."
+ binary package manager. This package includes the binary utilities
+ to be able to handle XBPS binary packages."
 
-conf_files="/etc/xbps-src.conf"
+subpackages="$pkgname-static"
+Add_dependency run glibc
+Add_dependency run libarchive
+Add_dependency run proplib
+Add_dependency run openssl
+Add_dependency build libarchive-devel
+Add_dependency build proplib-devel
+Add_dependency build openssl-devel
+Add_dependency build asciidoc
 
-Add_dependency full glibc
-Add_dependency full libarchive
-Add_dependency full proplib
+post_install()
+{
+	mkdir -p ${DESTDIR}/usr || return 1
+	mv ${DESTDIR}/share ${DESTDIR}/usr || return 1
+}
diff --git a/srcpkgs/xbps/xbps-static.template b/srcpkgs/xbps/xbps-static.template
new file mode 100644
index 0000000000..392434a13a
--- /dev/null
+++ b/srcpkgs/xbps/xbps-static.template
@@ -0,0 +1,14 @@
+# Template file for 'xbps-static'.
+#
+short_desc="${sourcepkg} static binaries"
+long_desc="${long_desc}
+
+ This package contains the static binaries and library, that can be
+ used on any GNU/Linux distribution matching the architecture."
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/sbin ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/sbin/*.static ${DESTDIR}/sbin
+	mv ${SRCPKGDESTDIR}/lib/*.a ${DESTDIR}/usr/lib
+}