diff --git a/common/build-helper/gir.sh b/common/build-helper/gir.sh
index 70699ad..e4ecd4f 100644
--- a/common/build-helper/gir.sh
+++ b/common/build-helper/gir.sh
@@ -17,7 +17,7 @@ if [ "$build_option_gir" ] || [[ $build_options != *"gir"* ]]; then
 	if [ "$CROSS_BUILD" ]; then
 		# Required for running binaries produced from g-ir-compiler
 		# via g-ir-scanner-qemuwrapper
-		hostmakedepends+=" qemu-user-static"
+		hostmakedepends+=" qemu-user"
 
 		# Required for running the g-ir-scanner-lddwrapper
 		hostmakedepends+=" prelink-cross"
diff --git a/common/build-helper/qemu.sh b/common/build-helper/qemu.sh
index d6a4342..f5c5658 100644
--- a/common/build-helper/qemu.sh
+++ b/common/build-helper/qemu.sh
@@ -1,7 +1,7 @@
 if [ "$CROSS_BUILD" ]; then
 	export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
-	if [[ $hostmakedepends != *"qemu-user-static"* ]]; then
-		hostmakedepends+=" qemu-user-static"
+	if [[ $hostmakedepends != *"qemu-user"* ]]; then
+		hostmakedepends+=" qemu-user"
 	fi
 fi
 
diff --git a/common/shlibs b/common/shlibs
index a0d4b5f..4b9f7d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1408,7 +1408,7 @@ libgda-xslt-5.0.so.4 libgda-5.2.9_4
 libamtk-5.so.0 amtk-5.0.0_1
 libdevhelp-3.so.6 devhelp-libs-3.30.0_1
 libunistring.so.2 libunistring-0.9.4_1
-libguile-2.2.so.1 libguile-2.2.7_1
+libguile-3.0.so.1 libguile-3.0.10_1
 libopts.so.25 libopts-5.18.4_6
 libanjuta-3.so.0 anjuta-3.8.4_1
 libgmlib.so.1 gmtk-1.0.8_1
diff --git a/xbps-src b/xbps-src
index f8c21b3..00e955f 100755
--- a/xbps-src
+++ b/xbps-src
@@ -166,7 +166,7 @@ Options:
 
 -A <host>
     Use this host machine. Automatically creates masterdir-<host> if it doesn't
-    already exist. Some host machines may require qemu-user-static and
+    already exist. Some host machines may require qemu-user and
     binfmt-support if not natively supported by the processor. Supported hosts:
 
 $(print_cross_targets)