diff --git a/Makefile b/Makefile
index d1d925f8..c56ce92b 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endif
 
 GLUON_LANGS ?= en
 
-export GLUON_RELEASE GLUON_ATH10K_MESH GLUON_REGION
+export GLUON_RELEASE GLUON_ATH10K_MESH GLUON_REGION GLUON_DEBUG
 
 
 update: FORCE
diff --git a/targets/generic b/targets/generic
index 5c62cd6c..acc19ba1 100644
--- a/targets/generic
+++ b/targets/generic
@@ -12,3 +12,11 @@ config 'CONFIG_LUCI_SRCDIET=y'
 
 config 'CONFIG_TARGET_MULTI_PROFILE=y'
 config 'CONFIG_TARGET_PER_DEVICE_ROOTFS=y'
+
+if [ "$GLUON_DEBUG" ]
+then
+	config 'CONFIG_DEBUG=y'
+	config 'CONFIG_NO_STRIP=y'
+	config '# CONFIG_USE_STRIP is not set'
+	config '# CONFIG_USE_SSTRIP is not set'
+fi