diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index a0db9a061aa..dca95137ba5 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -798,7 +798,15 @@ void AndroidConfigurations::updateAutomaticKitList()
             ToolChainKitInformation::setToolChain(newKit, tc);
             QtSupport::QtKitInformation::setQtVersion(newKit, qt);
             DeviceKitInformation::setDevice(newKit, device);
-            Debugger::DebuggerKitInformation::setDebugger(newKit, tc->suggestedDebugger());
+
+            Debugger::DebuggerItem debugger;
+            debugger.setCommand(tc->suggestedDebugger());
+            debugger.setEngineType(Debugger::GdbEngineType);
+            debugger.setDisplayName(tr("Android Debugger for %1").arg(tc->displayName()));
+            debugger.setAutoDetected(true);
+            debugger.setAbi(tc->targetAbi());
+            Debugger::DebuggerKitInformation::setDebugger(newKit, debugger);
+
             AndroidGdbServerKitInformation::setGdbSever(newKit, tc->suggestedGdbServer());
             newKit->makeSticky();
             newKits << newKit;
diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp
index f0625c83ae1..b5ceed0415a 100644
--- a/src/plugins/debugger/debuggerkitconfigwidget.cpp
+++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp
@@ -254,14 +254,6 @@ void DebuggerKitInformation::setDebugger(Kit *k, const DebuggerItem &item)
     k->setValue(DebuggerKitInformation::id(), id);
 }
 
-void DebuggerKitInformation::setDebugger(Kit *k, const FileName &command)
-{
-    DebuggerItem item;
-    item.setEngineType(GdbEngineType);
-    item.setCommand(command);
-    setDebugger(k, item);
-}
-
 Core::Id DebuggerKitInformation::id()
 {
     return "Debugger.Information";
diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h
index 30623bdae0e..dc3c5e2b64d 100644
--- a/src/plugins/debugger/debuggerkitinformation.h
+++ b/src/plugins/debugger/debuggerkitinformation.h
@@ -107,7 +107,6 @@ public:
     ItemList toUserOutput(const ProjectExplorer::Kit *k) const;
 
     static void setDebugger(ProjectExplorer::Kit *k, const DebuggerItem &item);
-    static void setDebugger(ProjectExplorer::Kit *k, const Utils::FileName &command);
 
     static Core::Id id();
     static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *k);