diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index e7f016a4c..82e978a12 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -18,3 +18,11 @@ choice
 		depends BROKEN
 
 endchoice
+
+
+# Debug version.
+
+config UCLIBC_ENABLE_DEBUG
+	bool "Build with debug information"
+	depends on TOOLCHAINOPTS && USE_UCLIBC
+	default n
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index f1e6fedb8..4ea15f14b 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -97,6 +97,10 @@ UCLIBC_MAKE = PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
 	LIBGCC="$(subst libgcc.a,libgcc_initial.a,$(shell $(TARGET_CC) -print-libgcc-file-name))" \
 	DOSTRIP=""
 
+ifeq ($(CONFIG_UCLIBC_ENABLE_DEBUG),y)
+	UCLIBC_MAKE += DODEBUG=y
+endif
+
 define Host/Compile
 	$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(HOST_BUILD_DIR)/Rules.mak
 	$(UCLIBC_MAKE) PREFIX= all