diff --git a/srcpkgs/libxbps-devel-git b/srcpkgs/libxbps-devel-git
new file mode 120000
index 00000000000..d14b53352e6
--- /dev/null
+++ b/srcpkgs/libxbps-devel-git
@@ -0,0 +1 @@
+xbps-git
\ No newline at end of file
diff --git a/srcpkgs/libxbps-git b/srcpkgs/libxbps-git
new file mode 120000
index 00000000000..d14b53352e6
--- /dev/null
+++ b/srcpkgs/libxbps-git
@@ -0,0 +1 @@
+xbps-git
\ No newline at end of file
diff --git a/srcpkgs/xbps-devel-static b/srcpkgs/xbps-devel-static
deleted file mode 120000
index bc58c7d7066..00000000000
--- a/srcpkgs/xbps-devel-static
+++ /dev/null
@@ -1 +0,0 @@
-xbps-devel
\ No newline at end of file
diff --git a/srcpkgs/xbps-git/libxbps-devel-git.template b/srcpkgs/xbps-git/libxbps-devel-git.template
new file mode 100644
index 00000000000..c6ab032ada7
--- /dev/null
+++ b/srcpkgs/xbps-git/libxbps-devel-git.template
@@ -0,0 +1,16 @@
+# Template file for 'libxbps'.
+#
+short_desc="${short_desc} - runtime library (development files)"
+long_desc="${long_desc}
+
+ This package contains the libxbps develoment files."
+
+depends="libxbps-git>=$version"
+provides="libxbps-devel-9999"
+replaces="libxbps-devel>=0"
+
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
+}
diff --git a/srcpkgs/xbps-devel/xbps-devel.rshlibs b/srcpkgs/xbps-git/libxbps-git.rshlibs
similarity index 90%
rename from srcpkgs/xbps-devel/xbps-devel.rshlibs
rename to srcpkgs/xbps-git/libxbps-git.rshlibs
index 2d31f765a26..5875845c862 100644
--- a/srcpkgs/xbps-devel/xbps-devel.rshlibs
+++ b/srcpkgs/xbps-git/libxbps-git.rshlibs
@@ -3,7 +3,6 @@ libz.so.1
 libpthread.so.0
 libprop.so.0
 libarchive.so.12
+libconfuse.so.0
 libcrypto.so.1
 libc.so.6
-libconfuse.so.0
-librt.so.1
diff --git a/srcpkgs/xbps-git/libxbps-git.template b/srcpkgs/xbps-git/libxbps-git.template
new file mode 100644
index 00000000000..a92e451232d
--- /dev/null
+++ b/srcpkgs/xbps-git/libxbps-git.template
@@ -0,0 +1,13 @@
+# Template file for 'libxbps'.
+#
+short_desc="${short_desc} - runtime library"
+long_desc="${long_desc}
+
+ This package contains libxbps, the XBPS runtime shared library."
+
+provides="libxbps-9999"
+replaces="libxbps>=0 xbps-devel>=0"
+
+do_install() {
+	vmove "usr/lib/*.so*" usr/lib
+}
diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-git/template
similarity index 81%
rename from srcpkgs/xbps-devel/template
rename to srcpkgs/xbps-git/template
index fe811e4535c..9d84105ebb3 100644
--- a/srcpkgs/xbps-devel/template
+++ b/srcpkgs/xbps-git/template
@@ -1,17 +1,17 @@
-# Template file for 'xbps'
-pkgname=xbps-devel
+# Template file for 'xbps-git'
+pkgname=xbps-git
 version="$(date -u +%Y%m%d)"
+revision=1
 nofetch=yes
 noextract=yes
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --with-pie --with-tests"
-depends="xbps-triggers"
+depends="xbps-triggers libxbps-git>=$version"
 makedepends="git which pkg-config zlib-devel proplib-devel openssl-devel libarchive-devel libfetch-devel confuse-devel atf-devel"
 conf_files="/etc/xbps/xbps.conf"
-subpackages="$pkgname-static"
+subpackages="libxbps-git libxbps-devel-git xbps-tests-git xbps-static-git"
 provides="xbps-9999"
-replaces="xbps>=0"
-revision=1
+replaces="xbps>=0 xbps-devel>=0"
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
diff --git a/srcpkgs/xbps-git/xbps-git.rshlibs b/srcpkgs/xbps-git/xbps-git.rshlibs
new file mode 100644
index 00000000000..75a82f1d70f
--- /dev/null
+++ b/srcpkgs/xbps-git/xbps-git.rshlibs
@@ -0,0 +1,5 @@
+libpthread.so.0
+libprop.so.0
+librt.so.1
+libxbps.so.0
+libc.so.6
diff --git a/srcpkgs/xbps-devel/xbps-devel-static.template b/srcpkgs/xbps-git/xbps-static-git.template
similarity index 75%
rename from srcpkgs/xbps-devel/xbps-devel-static.template
rename to srcpkgs/xbps-git/xbps-static-git.template
index 3b077f90857..32b65911a70 100644
--- a/srcpkgs/xbps-devel/xbps-devel-static.template
+++ b/srcpkgs/xbps-git/xbps-static-git.template
@@ -1,7 +1,7 @@
 # Template file for 'xbps-devel-static'.
 #
 provides="xbps-static-9999"
-replaces="xbps-static>=0"
+replaces="xbps-static>=0 xbps-devel-static>=0"
 depends="xbps-triggers"
 short_desc="${sourcepkg} static binaries"
 long_desc="${long_desc}
@@ -10,8 +10,5 @@ long_desc="${long_desc}
  used on any GNU/Linux distribution matching the architecture."
 
 do_install() {
-	vmove usr/include usr
 	vmove "usr/sbin/*.static" usr/sbin
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/xbps-git/xbps-tests-git.rshlibs b/srcpkgs/xbps-git/xbps-tests-git.rshlibs
new file mode 100644
index 00000000000..d0e1ce3e83e
--- /dev/null
+++ b/srcpkgs/xbps-git/xbps-tests-git.rshlibs
@@ -0,0 +1,4 @@
+libprop.so.0
+libxbps.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/xbps-git/xbps-tests-git.template b/srcpkgs/xbps-git/xbps-tests-git.template
new file mode 100644
index 00000000000..e645fe510fe
--- /dev/null
+++ b/srcpkgs/xbps-git/xbps-tests-git.template
@@ -0,0 +1,14 @@
+# Template file for 'xbps-tests'.
+#
+short_desc="${short_desc} - Kyua testsuite"
+long_desc="${long_desc}
+
+ This package contains the Kyua testsuite."
+
+depends="libxbps-git>=$version"
+provides="xbps-tests-9999"
+replaces="xbps-tests>=0"
+
+do_install() {
+	vmove usr/tests usr
+}
diff --git a/srcpkgs/xbps-static-git b/srcpkgs/xbps-static-git
new file mode 120000
index 00000000000..d14b53352e6
--- /dev/null
+++ b/srcpkgs/xbps-static-git
@@ -0,0 +1 @@
+xbps-git
\ No newline at end of file
diff --git a/srcpkgs/xbps-tests-git b/srcpkgs/xbps-tests-git
new file mode 120000
index 00000000000..d14b53352e6
--- /dev/null
+++ b/srcpkgs/xbps-tests-git
@@ -0,0 +1 @@
+xbps-git
\ No newline at end of file