diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index e65dde09cb89496a83ece5cddf2a8b7dbac6f120..b3b6e91e05a4577f48f1e7f775760824fddca2f1 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4774,6 +4774,13 @@ void GdbEngine::startGdb(const QStringList &args)
     gdbArgs << _("mi");
     if (!debuggerCore()->boolSetting(LoadGdbInit))
         gdbArgs << _("-n");
+    if (HostOsInfo::isWindowsHost()) {
+        const QFileInfo gdbBinaryFile(m_gdb);
+        const QString gdbDirectory(gdbBinaryFile.absolutePath());
+        const QString gdbDataDir = gdbDirectory + _("/data-directory");
+        if (QFile::exists(gdbDataDir))
+            gdbArgs << _("--data-directory") << gdbDataDir;
+    }
     gdbArgs += args;
 
     connect(gdbProc(), SIGNAL(error(QProcess::ProcessError)),