diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc
index ac18afa..125d314 100644
--- a/conf/distro/include/tcmode-external-sourcery.inc
+++ b/conf/distro/include/tcmode-external-sourcery.inc
@@ -39,7 +39,7 @@ PREFERRED_PROVIDER_virtual/libc ?= "glibc-external"
 PREFERRED_PROVIDER_virtual/libintl ?= "glibc-external"
 PREFERRED_PROVIDER_virtual/libiconv ?= "glibc-external"
 
-PREFERRED_PROVIDER_gdbserver ??= "gdbserver-external"
+PREFERRED_PROVIDER_gdbserver ??= "gdb"
 PREFERRED_PROVIDER_oprofile ??= "oprofile"
 
 # These are defined in default-providers.inc, which is parsed before the
diff --git a/core/recipes-devtools/gdb/gdb_%.bbappend b/core/recipes-devtools/gdb/gdb_%.bbappend
index 504b2a5..65d4cdf 100644
--- a/core/recipes-devtools/gdb/gdb_%.bbappend
+++ b/core/recipes-devtools/gdb/gdb_%.bbappend
@@ -1,4 +1,4 @@
-PROVIDES += "gdbserver"
+PROVIDES += "${@'gdbserver' if '${PREFERRED_PROVIDER_gdbserver}' == '${PN}' else ''}"
 
 # Disable build of gdbserver if is provided by external-sourcery-toolchain
 PACKAGES := "${@oe_filter_out('gdbserver' if '${PREFERRED_PROVIDER_gdbserver}' != '${PN}' else '$', '${PACKAGES}', d)}"