diff --git a/doc/22-debug.md b/doc/22-debug.md
index 90ca0c6cb..8c907307f 100644
--- a/doc/22-debug.md
+++ b/doc/22-debug.md
@@ -114,8 +114,9 @@ the duplicate import in your `~/.gdbinit` file.
 ### <a id="development-debug-gdb-run"></a> GDB Run
 
 Call GDB with the binary and all arguments and run it in foreground.
+If VFork causes trouble disable it inside the gdb run.
 
-    # gdb --args /usr/sbin/icinga2 daemon -x debug
+    # gdb --args /usr/sbin/icinga2 daemon -x debug -DUseVfork=0
 
 > **Note**
 >
@@ -134,6 +135,14 @@ Continue after breakpoint.
 
     (gdb) c
 
+### <a id="development-debug-gdb-coredump"></a> GDB Core Dump
+
+Either attach to the running process using `gdb -p PID` or start
+a new gdb run.
+
+    (gdb) r
+    (gdb) generate-core-file
+
 ### <a id="development-debug-gdb-backtrace"></a> GDB Backtrace
 
 If Icinga 2 aborted its operation abnormally, generate a backtrace.
@@ -141,11 +150,13 @@ If Icinga 2 aborted its operation abnormally, generate a backtrace.
     (gdb) bt
     (gdb) bt full
 
->**Tip**
->
-> If you're opening an issue at [https://dev.icinga.org] make sure
-> to attach as much detail as possible.
+Generate a full backtrace for all threads and store it into a new file
+(e.g. for debugging dead locks):
 
+    # gdb -p PID -batch -ex "thread apply all bt full" -ex "detach" -ex "q" > gdb_bt.log
+
+If you're opening an issue at [https://dev.icinga.org] make sure
+to attach as much detail as possible.
 
 ### <a id="development-debug-gdb-backtrace-stepping"></a> GDB Backtrace Stepping