diff --git a/srcpkgs/xbps/INSTALL b/srcpkgs/xbps/INSTALL
index 174be72d4bb..a0a3dcfca94 100644
--- a/srcpkgs/xbps/INSTALL
+++ b/srcpkgs/xbps/INSTALL
@@ -1,6 +1,12 @@
 case "${ACTION}" in
 post)
-	chown root:xbuilder usr/sbin/xbps-uchroot
-	chmod 4750 usr/sbin/xbps-uchroot
+	chown root:xbuilder usr/bin/xbps-uchroot
+	chmod 4750 usr/bin/xbps-uchroot
+
+	if [ -d usr/sbin -a ! -L /usr/sbin ]; then
+		for f in usr/bin/xbps-*; do
+			ln -sr $f usr/sbin/$(basename $f)
+		done
+	fi
 	;;
 esac
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 9f36ca78c1e..ff385a9eb04 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.44.1
-revision=7
+revision=8
 bootstrap=yes
 build_style=configure
 short_desc="The XBPS package system utilities"