diff --git a/srcpkgs/xbps/libxbps-devel.template b/srcpkgs/xbps/libxbps-devel.template
index 2b37f75045..65483aa9af 100644
--- a/srcpkgs/xbps/libxbps-devel.template
+++ b/srcpkgs/xbps/libxbps-devel.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains the libxbps develoment files."
 
 depends="zlib-devel proplib-devel confuse-devel libfetch-devel libarchive-devel libxbps>=$version"
-replaces="xbps-static<0.16.3_2"
+replaces="xbps-static<0.16.3_2 libxbps-devel>=0"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/xbps/libxbps.template b/srcpkgs/xbps/libxbps.template
index f62608ed58..8c4cfc3fa9 100644
--- a/srcpkgs/xbps/libxbps.template
+++ b/srcpkgs/xbps/libxbps.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains libxbps, the XBPS runtime shared library."
 
-replaces="xbps<0.16.3_2"
+replaces="xbps<0.16.3_2 libxbps>=0"
 
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index fb05a0e699..7a26d3eca8 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.16.4
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --with-pie --sbindir=/usr/sbin --with-tests"
 depends="xbps-triggers"
diff --git a/srcpkgs/xbps/xbps-tests.template b/srcpkgs/xbps/xbps-tests.template
index 5d22350d84..7b044967e5 100644
--- a/srcpkgs/xbps/xbps-tests.template
+++ b/srcpkgs/xbps/xbps-tests.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains the Kyua testsuite."
 
-replaces="xbps<0.16.3_2"
+replaces="xbps<0.16.3_2 xbps-tests>=0"
 
 do_install() {
 	vmove usr/tests usr