diff --git a/templates/initramfs-tools/template b/templates/initramfs-tools/template
index dc6075b8a1..fbe28ecc56 100644
--- a/templates/initramfs-tools/template
+++ b/templates/initramfs-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'initramfs-tools'
 pkgname=initramfs-tools
 version=0.93.2
-revision=4
+revision=5
 wrksrc=$pkgname
 patch_files="$pkgname-xbps.diff"
 distfiles="${DEBIAN_SITE}/main/i/${pkgname}/${pkgname}_${version}.tar.gz"
@@ -35,7 +35,7 @@ Add_dependency full udev
 Add_dependency full module-init-tools
 Add_dependency build klibc
 Add_dependency run klibc-utils
-Add_dependency run xbps-base-pkg
+Add_dependency run xbps
 
 do_install()
 {
diff --git a/templates/xbps-base-pkg/template b/templates/xbps-base-pkg/template
deleted file mode 100644
index 8987a8aac4..0000000000
--- a/templates/xbps-base-pkg/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'xbps-base-pkg'
-pkgname=xbps-base-pkg
-version=0.6
-build_style=custom-install
-short_desc="xbps base package utils"
-maintainer="Juan RP <xtraeme@gmail.com>"
-long_desc="
- This package installs the xbps base package utilities, to handle
- xbps binary packages."
-
-Add_dependency run glibc
-Add_dependency run libarchive
-Add_dependency run proplib
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/lib
-
-	for f in bin cmpver digest repo pkgdb; do
-		install -D -m755 /usr/local/sbin/xbps-${f} \
-			${DESTDIR}/sbin/xbps-${f}
-	done
-	cp -a /usr/local/lib/libxbps.so* ${DESTDIR}/lib
-}
diff --git a/templates/xbps-base-system/template b/templates/xbps-base-system/template
index f103cdeab8..259a1320cd 100644
--- a/templates/xbps-base-system/template
+++ b/templates/xbps-base-system/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-base-chroot'
 pkgname=xbps-base-system
-version=0.14
+version=0.15
 build_style=meta-template
 short_desc="xbps base system packages"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -47,7 +47,7 @@ Add_dependency full dhcpcd
 Add_dependency full sysvinit
 Add_dependency full net-tools
 Add_dependency full iputils
-Add_dependency full xbps-base-pkg
+Add_dependency full xbps
 Add_dependency full udev
 Add_dependency full cronie
 Add_dependency full metalog
diff --git a/templates/xbps/template b/templates/xbps/template
new file mode 100644
index 0000000000..0d3fc02ea8
--- /dev/null
+++ b/templates/xbps/template
@@ -0,0 +1,18 @@
+# Template file for 'xbps'
+pkgname=xbps
+version=0.1rc1
+distfiles="http://launchpad.net/xbps/0.1/$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"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=5081cd74b13a36dbfabe94b8f0928c53631f01fd8cc1adf1a3fe10ca1bad76dc
+long_desc="
+ The XBPS package system. A new, fast, from scratch and simple
+ binary package manager."
+
+conf_files="/etc/xbps-src.conf"
+
+Add_dependency run glibc
+Add_dependency run libarchive
+Add_dependency run proplib