diff --git a/config_help.txt b/config_help.txt
index 3e2c0c61b0..d15e113b9a 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -95,6 +95,8 @@ Build options:
   -optimized-tools ..... Build optimized host tools even in debug build [no]
   -force-debug-info .... Create symbol files for release builds [no]
   -separate-debug-info . Split off debug information to separate files [no]
+  -gdb-index ........... Index the debug info to speed up GDB
+                         [no; auto if -developer-build with debug info]
   -strip ............... Strip release binaries of unneeded symbols [yes]
   -force-asserts ....... Enable Q_ASSERT even in release builds [no]
   -developer-build ..... Compile and link Qt for developing Qt itself
diff --git a/configure.json b/configure.json
index 3f751203b8..003c6c5b90 100644
--- a/configure.json
+++ b/configure.json
@@ -78,6 +78,7 @@
             "force-debug-info": { "type": "boolean", "name": "force_debug_info" },
             "force-pkg-config": { "type": "void", "name": "pkg-config" },
             "framework": "boolean",
+            "gdb-index": { "type": "boolean", "name": "gdb_index" },
             "gcc-sysroot": "boolean",
             "gcov": "boolean",
             "gnumake": { "type": "boolean", "name": "GNUmake" },