diff --git a/Manual.md b/Manual.md
index 68774a2123c..d4aeb38e942 100644
--- a/Manual.md
+++ b/Manual.md
@@ -393,7 +393,7 @@ files are always removed automatically.
 This must match the basename of any url defined in `${distfiles}`.
 Example `skip_extraction="foo-${version}.tar.gz"`.
 
-- `disable_debug` If enabled -dbg packages won't be generated even if `XBPS_DEBUG_PKGS` is set.
+- `nodebug` If enabled -dbg packages won't be generated even if `XBPS_DEBUG_PKGS` is set.
 
 - `force_debug_pkgs` If enabled binary packages with debugging symbols will be generated
 even if `XBPS_DEBUG_PKGS` is disabled in `void-packages/etc/conf` or in the
diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh
index cb68a0dcf38..6e8b5731853 100644
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -17,7 +17,7 @@ unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF
 unset -v skip_extraction
 
 # hooks/post-install/03-strip-and-debug-pkgs
-unset -v disable_debug force_debug_pkgs
+unset -v nodebug force_debug_pkgs
 
 ## FUNCTIONS
 unset -f pre_fetch do_fetch post_fetch
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 68ee27465f8..a10ddd38032 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=
 
-	[ -n "$disable_debug" ] && return 0
+	[ -n "$nodebug" ] && 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=
 
-	[ -n "$disable_debug" ] && return 0
+	[ -n "$nodebug" ] && 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=
 
-	[ -n "$disable_debug" ] && return 0
+	[ -n "$nodebug" ] && 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 8fa73daf31a..1ffc316c778 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -320,14 +320,14 @@ setup_pkg() {
     fi
 
     if [ -z "$XBPS_DEBUG_PKGS" -o "$repository" = "nonfree" ]; then
-        disable_debug=yes
+        nodebug=yes
     fi
     # If a package sets force_debug_pkgs, always build -dbg pkgs.
     if [ -n "$force_debug_pkgs" ]; then
-        unset disable_debug
+        unset nodebug
     fi
     # -g is required to build -dbg packages.
-    if [ -z "$disable_debug" ]; then
+    if [ -z "$nodebug" ]; then
         dbgflags="-g"
     fi