diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
index da0512fe5a..68ee27465f 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -6,7 +6,7 @@
 make_debug() {
 	local dname= fname= dbgfile=
 
-	[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0
+	[ -n "$disable_debug" ] && return 0
 
 	dname=$(echo "$(dirname $1)"|sed -e "s|${PKGDESTDIR}||g")
 	fname="$(basename $1)"
@@ -25,7 +25,7 @@ make_debug() {
 attach_debug() {
 	local dname= fname= dbgfile=
 
-	[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0
+	[ -n "$disable_debug" ] && return 0
 
 	dname=$(echo "$(dirname $1)"|sed -e "s|${PKGDESTDIR}||g")
 	fname="$(basename $1)"
@@ -41,7 +41,7 @@ attach_debug() {
 create_debug_pkg() {
 	local _pkgname= _destdir=
 
-	[ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0
+	[ -n "$disable_debug" ] && return 0
 	[ ! -d "${PKGDESTDIR}/usr/lib/debug" ] && return 0
 
 	_pkgname="${pkgname}-dbg-${version}"
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 74d5ebe242..008675e939 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -319,8 +319,7 @@ setup_pkg() {
         makejobs="-j$XBPS_MAKEJOBS"
     fi
 
-    # For nonfree/bootstrap pkgs there's no point in building -dbg pkgs, disable them.
-    if [ -z "$XBPS_DEBUG_PKGS" -o "$repository" = "nonfree" -o -n "$bootstrap" ]; then
+    if [ -z "$XBPS_DEBUG_PKGS" -o "$repository" = "nonfree" ]; then
         disable_debug=yes
     fi
     # If a package sets force_debug_pkgs, always build -dbg pkgs.