diff --git a/xbps-src/shutils/common_funcs.sh b/xbps-src/shutils/common_funcs.sh
index 37e9f25567..b9f96dcf7e 100644
--- a/xbps-src/shutils/common_funcs.sh
+++ b/xbps-src/shutils/common_funcs.sh
@@ -70,6 +70,15 @@ remove_pkgdestdir_sighandler()
 		rm -rf "$XBPS_DESTDIR/${sourcepkg}-${version%_*}"
 	fi
 	msg_red "'${sourcepkg}-${lver}': removed files from DESTDIR...\n"
+        #
+	# If XBPS_PREFER_BINPKG_DEPS is set, we should remove those
+	# package dependencies installed by the target package, do it.
+	#
+	if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$base_chroot" ]; then
+		msg_normal "Removing binary package dependencies...\n"
+		${fakeroot_cmd} ${fakeroot_cmd_args} \
+			${XBPS_BIN_CMD} -Rpyf autoremove
+	fi
 }
 
 var_is_a_function()
diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in
index 0565b70717..f9109ae6b8 100644
--- a/xbps-src/shutils/pkgtarget_funcs.sh.in
+++ b/xbps-src/shutils/pkgtarget_funcs.sh.in
@@ -217,7 +217,7 @@ remove_pkg()
 
 	ver=$($XBPS_PKGDB_CMD version $pkgname)
 	if [ -z "$ver" ]; then
-		msg_warning "$pkgname is not installed.\n"
+		msg_warn "$pkgname is not installed.\n"
 	fi
 
 	. $XBPS_SHUTILSDIR/stow_funcs.sh