diff --git a/README.md b/README.md
index fd49e1fe093..75bc2d0b6a9 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ are isolated (among others).
 ### Requirements
 
 - GNU bash
-- xbps >= 0.41
+- xbps >= 0.42
 
 A privileged group is required to be able to execute `xbps-uchroot(8)`, by default in void
 it's the `xbuilder` group.
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index ed57657dfd6..a2e25ff8bf9 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -44,14 +44,14 @@ _EOF
     cp -f /etc/resolv.conf $XBPS_MASTERDIR/etc
 
     # Update xbps alternative repository if set.
-    mkdir -p $XBPS_MASTERDIR/etc/xbps/repo.d
+    mkdir -p $XBPS_MASTERDIR/etc/xbps.d
     if [ -n "$XBPS_ALT_REPOSITORY" ]; then
         ( \
             echo "repository=/host/binpkgs/${XBPS_ALT_REPOSITORY}"; \
             echo "repository=/host/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
-            ) > $XBPS_MASTERDIR/etc/xbps/repo.d/00-alternative.conf
+            ) > $XBPS_MASTERDIR/etc/xbps.d/00-repository-alternative.conf
     else
-        rm -f $XBPS_MASTERDIR/etc/xbps/repo.d/00-alternative.conf
+        rm -f $XBPS_MASTERDIR/etc/xbps.d/00-repository-alternative.conf
     fi
 
     if [ -d $XBPS_MASTERDIR/tmp ]; then
@@ -88,8 +88,8 @@ chroot_prepare() {
 
     echo "syslog=false" >> $XBPS_MASTERDIR/etc/xbps/xbps.conf
     echo "cachedir=/host/repocache" >> $XBPS_MASTERDIR/etc/xbps/xbps.conf
-    mkdir -p $XBPS_MASTERDIR/etc/xbps/repo.d
-    ln -s /dev/null $XBPS_MASTERDIR/etc/xbps/repo.d/00-main.conf
+    mkdir -p $XBPS_MASTERDIR/etc/xbps.d
+    ln -s /dev/null $XBPS_MASTERDIR/etc/xbps.d/00-repository-main.conf
 
     # Prepare default locale: en_US.UTF-8.
     if [ -s ${XBPS_MASTERDIR}/etc/default/libc-locales ]; then
@@ -108,30 +108,30 @@ chroot_sync_repos() {
 
     # Copy xbps configuration files to the masterdir.
     install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-local.conf \
-        ${XBPS_MASTERDIR}/etc/xbps/repo.d/10-local.conf
+        ${XBPS_MASTERDIR}/etc/xbps.d/10-repository-local.conf
     install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote.conf \
-        ${XBPS_MASTERDIR}/etc/xbps/repo.d/20-remote.conf
+        ${XBPS_MASTERDIR}/etc/xbps.d/20-repository-remote.conf
 
     if [ "$XBPS_MACHINE" = "x86_64" ]; then
         install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-local-x86_64.conf \
-            ${XBPS_MASTERDIR}/etc/xbps/repo.d/12-local-x86_64.conf
+            ${XBPS_MASTERDIR}/etc/xbps.d/12-repository-local-x86_64.conf
         install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote-x86_64.conf \
-            ${XBPS_MASTERDIR}/etc/xbps/repo.d/22-remote-x86_64.conf
+            ${XBPS_MASTERDIR}/etc/xbps.d/22-repository-remote-x86_64.conf
     fi
 
     # if -N is set, comment out remote repositories from xbps.conf.
     if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
-        rm -f ${XBPS_MASTERDIR}/etc/xbps/repo.d/20-remote.conf
-        rm -f ${XBPS_MASTERDIR}/etc/xbps/repo.d/22-remote-x86_64.conf
+        rm -f ${XBPS_MASTERDIR}/etc/xbps.d/20-repository-remote.conf
+        rm -f ${XBPS_MASTERDIR}/etc/xbps.d/22-repository-remote-x86_64.conf
     fi
 
     # Copy host repos to the cross root.
     if [ -n "$XBPS_CROSS_BUILD" ]; then
-        rm -rf $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps/repo.d
-        mkdir -p $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps/repo.d
-        cp ${XBPS_MASTERDIR}/etc/xbps/repo.d/*.conf \
-            $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps/repo.d
-        rm -f $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps/repo.d/*-x86_64.conf
+        rm -rf $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps.d
+        mkdir -p $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps.d
+        cp ${XBPS_MASTERDIR}/etc/xbps.d/*.conf \
+            $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps.d
+        rm -f $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps.d/*-x86_64.conf
     fi
 
     # Make sure to sync index for remote repositories.
diff --git a/xbps-src b/xbps-src
index 6401021a291..e8db4149ed5 100755
--- a/xbps-src
+++ b/xbps-src
@@ -304,7 +304,7 @@ read_pkg() {
     setup_pkg $XBPS_TARGET_PKG $XBPS_CROSS_BUILD
 }
 
-readonly XBPS_VERSION_REQ="0.41"
+readonly XBPS_VERSION_REQ="0.42"
 readonly XBPS_VERSION=$(xbps-uhelper -V|awk '{print $2}')
 readonly XBPS_SRC_VERSION="113"
 export XBPS_MACHINE=$(uname -m)