diff --git a/doc/qtcreator/images/qtcreator-gdb-options.png b/doc/qtcreator/images/qtcreator-gdb-options.png
index d8f3f59be02..e1ec43cc37b 100644
Binary files a/doc/qtcreator/images/qtcreator-gdb-options.png and b/doc/qtcreator/images/qtcreator-gdb-options.png differ
diff --git a/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc b/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc
index ecd69024923..4abf8997e7d 100644
--- a/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc
+++ b/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc
@@ -162,6 +162,10 @@
     editor, select \uicontrol GDB > \uicontrol {Adjust breakpoint locations}
     or \uicontrol CDB > \uicontrol {Correct breakpoint location}.
 
+    When using GDB as backend, you can extend the ordinary GDB
+    breakpoint class by using Python. Select \uicontrol GDB >
+    \uicontrol {Use pseudo message tracepoints}.
+
     When using CDB as backend, you can specify that the debugger should break on
     specific events, such as C++ exceptions, thread creation or exit, loading or
     unloading \l{Viewing Modules}{application modules}, or particular output.
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc
index 72cd80d3a30..f1d74a9d8e9 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc
@@ -112,6 +112,10 @@
     By default, GDB shows AT&T style disassembly. To switch to the Intel style,
     select the \uicontrol {Use Intel style disassembly} check box.
 
+    To have GDB automatically save a copy of its symbol index in a cache
+    on disk and retrieve it from there when loading the same binary in the
+    future, select the \uicontrol {Use automatic symbol cache} check box.
+
     To execute GDB commands after GDB has been started, but before the debugged
     program is started or attached, and before the debugging helpers are
     initialized, enter them in the \uicontrol {Additional Startup Commands}
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
index 67b271053d2..34ecaa1785a 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
@@ -1540,8 +1540,16 @@
 
     \section1 Built-in Debugger Is Slow During Startup and Runtime
 
-    The part of the slowness that is related to the loading of debug information
-    is hard to avoid. Another part stems from maintaining breakpoints inside
+    Slowness that is related to the loading of debug information is hard to
+    avoid.
+
+    When using GDB as backend, you can automatically save a copy of
+    its symbol index in a cache on disk and retrieve it from there
+    when loading the same binary in the future. Select \uicontrol Tools
+    > \uicontrol Options > \uicontrol Debugger > \uicontrol GDB >
+    \uicontrol {Use automatic symbol cache}.
+
+    Some slowness stems from maintaining breakpoints inside
     the debugger (under some circumstances all breakpoints need to be inserted
     and removed again for each step) and the evaluation of expressions after
     each step. We recommend that you minimize the number of breakpoints and