diff --git a/common/environment/setup-subpkg/subpkg.sh b/common/environment/setup-subpkg/subpkg.sh
index 32650faf4fc..bc22068aca6 100644
--- a/common/environment/setup-subpkg/subpkg.sh
+++ b/common/environment/setup-subpkg/subpkg.sh
@@ -3,7 +3,7 @@
 
 ## VARIABLES
 unset -v noarch nonfree conf_files mutable_files preserve triggers
-unset -v depends run_depends replaces provides conflicts
+unset -v depends run_depends replaces provides conflicts tags
 
 # hooks/post-install/03-strip-and-debug-pkgs
 unset -v nostrip nostrip_files
diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh
index 2645a69b8d5..66ccd501e09 100644
--- a/common/hooks/do-pkg/00-gen-pkg.sh
+++ b/common/hooks/do-pkg/00-gen-pkg.sh
@@ -1,7 +1,9 @@
 # This hook generates a XBPS binary package from an installed package in destdir.
 
 genpkg() {
-	local pkgdir="$1" arch="$2" desc="$3" pkgver="$4" binpkg="$5" _deps= f=
+	local pkgdir="$1" arch="$2" desc="$3" pkgver="$4" binpkg="$5"
+	local _preserve _deps _shprovides _shrequires _gitrevs _provides _conflicts
+	local _replaces _mutable_files _conf_files f
 
 	if [ ! -d "${PKGDESTDIR}" ]; then
 		msg_warn "$pkgver: cannot find pkg destdir... skipping!\n"
@@ -94,7 +96,7 @@ genpkg() {
 		--desc "${desc}" \
 		--built-with "xbps-src-${XBPS_SRC_VERSION}" \
 		--build-options "${PKG_BUILD_OPTIONS}" \
-		--pkgver "${pkgver}" --quiet \
+		--pkgver "${pkgver}" --tags "${tags}" --quiet \
 		--source-revisions "${_gitrevs}" \
 		--shlib-provides "${_shprovides}" \
 		--shlib-requires "${_shrequires}" \
@@ -135,6 +137,7 @@ hook() {
 
 	# Generate -dbg pkg.
 	if [ -d "${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}" ]; then
+		source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
 		repo=$XBPS_REPOSITORY/debug
 		_pkgver=${pkgname}-dbg-${version}_${revision}
 		_desc="${short_desc} (debug files)"
@@ -147,7 +150,7 @@ hook() {
 		return
 	fi
 	if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then
-		unset conf_files provides replaces preserve
+		source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
 		if [ -n "$nonfree" ]; then
 			repo=$XBPS_REPOSITORY/multilib/nonfree
 		else
diff --git a/xbps-src b/xbps-src
index 7a3418d3462..1c36679a04e 100755
--- a/xbps-src
+++ b/xbps-src
@@ -299,8 +299,8 @@ read_pkg() {
     setup_pkg $XBPS_TARGET_PKG $XBPS_CROSS_BUILD
 }
 
-# Requires xbps>=0.35
-readonly XBPS_VERSION_REQ="0.35"
+# Requires xbps>=0.37
+readonly XBPS_VERSION_REQ="0.37"
 
 readonly XBPS_VERSION=$(xbps-uhelper -V|awk '{print $2}')
 readonly XBPS_SRC_VERSION="113"