diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index 73743e9effa..813d39596e2 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -19,10 +19,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	return 0
 fi
 
-if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	ln -sf lib ${XBPS_CROSS_BASE}/usr/lib32
-fi
-
 export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
 
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
diff --git a/common/xbps-src/shutils/cross.sh b/common/xbps-src/shutils/cross.sh
index b1892c327b2..dff434cb754 100644
--- a/common/xbps-src/shutils/cross.sh
+++ b/common/xbps-src/shutils/cross.sh
@@ -47,6 +47,8 @@ prepare_cross_sysroot() {
         msg_error "cannot continue due to errors above\n"
     fi
     rm -f $errlog
+    # Create top level symlinks in sysroot.
+    XBPS_ARCH=$XBPS_TARGET_ARCH xbps-reconfigure -r $XBPS_CROSS_BASE -f base-directories
 
     return 0
 }