diff --git a/ports/install.sh b/ports/install.sh
index f6232622..3e173f62 100755
--- a/ports/install.sh
+++ b/ports/install.sh
@@ -161,7 +161,7 @@ for dependency in "${DEPENDENCIES[@]}"; do
 
 	version_string="$(../get-version-string.sh)"
 	if [ -f "$PACKAGE_REPO/$version_string.xbps" ]; then
-		xbps-install \
+		run_xbps xbps-install \
 			-r "$BANAN_SYSROOT" \
 			-R "$PACKAGE_REPO" \
 			-y "$dependency" \
@@ -275,7 +275,10 @@ DESTDIR="$BANAN_SYSROOT"
 pre_install
 install
 post_install
+
 find "$BANAN_SYSROOT/usr/lib" -name '*.la' -delete
+rm -f "$BANAN_SYSROOT/usr/share/info/dir"
+
 grep -qsxF "$NAME-$VERSION" "$installed_file" || echo "$NAME-$VERSION" >> "$installed_file"
 
 if (( $PACKAGE )); then
@@ -297,7 +300,9 @@ if (( $PACKAGE )); then
 	pre_install
 	install
 	post_install
+
 	find "$DESTDIR/usr/lib" -name '*.la' -delete
+	rm -f "$DESTDIR/usr/share/info/dir"
 
 	mkdir -p "$PACKAGE_REPO"
 	cd "$PACKAGE_REPO"
diff --git a/ports/package-all-ports.sh b/ports/package-all-ports.sh
old mode 100644
new mode 100755
index e2be36ca..cffb7995
--- a/ports/package-all-ports.sh
+++ b/ports/package-all-ports.sh
@@ -17,7 +17,7 @@ package_standalone() {
 		done
 
 		find "$BANAN_SYSROOT/usr/lib" \( -type f -o -type l \) -delete
-		PACKAGE=1 ./build.sh || echo "$port_name" >> ../failed-shit
+		PACKAGE=1 ./build.sh || echo "$port_name" >> ../failed-ports
 	fi
 
 	popd >/dev/null
diff --git a/toolchain/build.sh b/toolchain/build.sh
index fa5dbc46..2f97bcb5 100755
--- a/toolchain/build.sh
+++ b/toolchain/build.sh
@@ -251,11 +251,10 @@ build_xbps() {
 	echo "Building xbps-$XBPS_VERSION"
 
 	CFLAGS=-Wno-discarded-qualifiers \
-	./configure \
-		--prefix="$BANAN_TOOLCHAIN_PREFIX" \
-		--dbdir="$BANAN_TOOLCHAIN_PREFIX/db"
+	./configure --prefix="$BANAN_TOOLCHAIN_PREFIX"
 	make $MAKE_JOBS
-	make install
+	make install || true
+	echo 'The previous error is expected :)'
 }
 
 BUILD_BINUTILS=1