diff --git a/config/debug/dmalloc.in b/config/debug/dmalloc.in
index 70da2630..fa0bbaab 100644
--- a/config/debug/dmalloc.in
+++ b/config/debug/dmalloc.in
@@ -4,7 +4,6 @@ menuconfig DMALLOC
     bool
     prompt "dmalloc"
     default n
-    depends on EXPERIMENTAL
 
 if DMALLOC
 
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index 2fd499df..9f5e8e30 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -4,7 +4,6 @@ menuconfig GDB
     bool
     prompt "gdb"
     default n
-    depends on EXPERIMENTAL
     help
       Enable gdb for the target
 
@@ -21,6 +20,7 @@ config GDB_NATIVE
     bool
     prompt "Native gdb"
     default n
+    depends on EXPERIMENTAL
     help
       Build and install a native gdb for the target, to run on the target.
 
diff --git a/scripts/build/debug/gdb.sh b/scripts/build/debug/gdb.sh
index 0b64f51b..5c2c2cee 100644
--- a/scripts/build/debug/gdb.sh
+++ b/scripts/build/debug/gdb.sh
@@ -95,8 +95,8 @@ do_debug_gdb_build() {
         CT_DoStep EXTRA "Installing native gdb"
         CT_DoLog EXTRA "Configuring native gdb"
 
-        mkdir -p "${CT_BUILD_DIR}/build-gdb-cross"
-        cd "${CT_BUILD_DIR}/build-gdb-cross"
+        mkdir -p "${CT_BUILD_DIR}/build-gdb-native"
+        cd "${CT_BUILD_DIR}/build-gdb-native"
 
         "${gdb_src_dir}/configure"                      \
             --build=${CT_BUILD}                         \
@@ -109,7 +109,7 @@ do_debug_gdb_build() {
             --disable-gdbtk                             \
             --without-x                                 \
             --disable-sim                               \
-            --enable-gdbserver                          \
+            --disable-gdbserver                          \
             --without-included-gettext                  \
             ${extra_config}                             2>&1 |CT_DoLog ALL