diff --git a/docs/datasheet/software.adoc b/docs/datasheet/software.adoc
index 44e8e6e5..4cf7f5a0 100644
--- a/docs/datasheet/software.adoc
+++ b/docs/datasheet/software.adoc
@@ -290,12 +290,18 @@ The makefile's `CC_OPTS` is exported as **define** to be available within a C pr
 | `-lc`                 | Search for the standard C library when linking.
 | `-lgcc`               | Make sure we have no unresolved references to internal GCC library subroutines.
 | `-mno-fdiv`           | Use built-in software functions for floating-point divisions and square roots (since the according instructions are not supported yet).
-| `-g`                  | Include debugging information/symbols in ELF.
 | `-mstrict-align`      | Unaligned memory accesses cannot be resolved by the hardware and require emulation.
 | `-mbranch-cost=10`    | Branching costs a lot of cycles.
 | `-ffp-contract=off`   | Do not allow contraction of floating-point operations (no fused operations as they are not supported).
 |=======================
 
+.Debug Symbols
+[IMPORTANT]
+By default, no debug symbols are added to the ELF.
+You can add them manually (to your local project's makefile) via `USER_FLAGS+=-g`.
+Note that other debug flags may be required depending of the GCC/GDB version
+(e.g. `USER_FLAGS += -ggdb -gdwarf-3`).
+
 :sectnums:
 ==== Custom (Compiler) Flags
 
diff --git a/docs/userguide/eclipse_ide.adoc b/docs/userguide/eclipse_ide.adoc
index 3fedaad5..c00c6570 100644
--- a/docs/userguide/eclipse_ide.adoc
+++ b/docs/userguide/eclipse_ide.adoc
@@ -190,6 +190,12 @@ the required `main.elf` file gets generated instead of _all_ executable files (l
 When you start debugging the first time you might need to select the provided debug configuration:
 **GDB OpenOCD Debugging > eclipse_example Default**
 
+.Debug Symbols
+[IMPORTANT]
+For debugging the ELF has to compiled to contain according debug symbols.
+Debug symbols are enabled by the project's local makefile: `USER_FLAGS += -ggdb -gdwarf-3`
+(this configuration seems to work best for Eclipse - at least for me).
+
 If you need to reconfigure OpenOCD binaries and/or paths:
 
 [start=1]