diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index a083e8c2bb3..0fd9dcadc16 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -11,6 +11,8 @@ bulk_getlink() {
 }
 
 bulk_build() {
+    local _pkgs pkg found f x tmpf
+
     if ! command -v xbps-checkvers &>/dev/null; then
         msg_error "xbps-src: cannot find xbps-checkvers(8) command!\n"
     fi
@@ -59,7 +61,7 @@ bulk_build() {
 }
 
 bulk_update() {
-    local args="$1" pkgs=
+    local args="$1" pkgs f
 
     pkgs="$(bulk_build ${args})"
     msg_normal "xbps-src: the following packages must be rebuilt and updated:\n"
@@ -68,6 +70,7 @@ bulk_update() {
     done
     echo
     for f in ${pkgs}; do
+        XBPS_TARGET_PKG=$f
         read_pkg
         msg_normal "xbps-src: building ${pkgver} ...\n"
         if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then
diff --git a/xbps-src b/xbps-src
index edf58101875..8c9ba2137bc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -467,7 +467,9 @@ readonly XBPS_DIGEST_CMD="xbps-uhelper digest"
 readonly XBPS_CMPVER_CMD="xbps-uhelper cmpver"
 
 readonly XBPS_TARGET="$1"
-readonly XBPS_TARGET_PKG="${2##*/}"
+if [ -n "$2" ]; then
+    readonly XBPS_TARGET_PKG="${2##*/}"
+fi
 
 # Check if stdout is a tty; if false disable colors.
 test -t 1 || export NOCOLORS=1