diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp
index d391907adca77a109bdabbce9d738669d884905d..7aed763489d1e6cebf24b7b3a7a8e1fe85122ed1 100644
--- a/src/plugins/debugger/gdbengine.cpp
+++ b/src/plugins/debugger/gdbengine.cpp
@@ -101,7 +101,7 @@ enum GdbCommandType
 
     GdbShowVersion = 100,
     GdbFileExecAndSymbols,
-    GdbQueryPwd,
+    //GdbQueryPwd,
     GdbQuerySources,
     GdbAsyncOutput2,
     GdbStart,
@@ -785,9 +785,11 @@ void GdbEngine::handleResult(const GdbResultRecord & record, int type,
         case GdbExecJumpToLine:
             handleExecJumpToLine(record);
             break;
+#if 0
         case GdbQueryPwd:
             handleQueryPwd(record);
             break;
+#endif
         case GdbQuerySources:
             handleQuerySources(record);
             break;
@@ -971,6 +973,7 @@ void GdbEngine::handleTargetCore(const GdbResultRecord &record)
     );
 }
 
+#if 0
 void GdbEngine::handleQueryPwd(const GdbResultRecord &record)
 {
     // FIXME: remove this special case as soon as 'pwd'
@@ -989,6 +992,7 @@ void GdbEngine::handleQueryPwd(const GdbResultRecord &record)
             m_pwd.chop(1);
 #endif
 #ifdef Q_OS_WIN
+        FIXME: this is broken
         // ~"Working directory C:\\Users\\Thomas\\Documents\\WBTest3\\debug.\n"
         m_pwd = record.data.findChild("consolestreamoutput").data();
         m_pwd = m_pwd.trimmed();
@@ -996,6 +1000,7 @@ void GdbEngine::handleQueryPwd(const GdbResultRecord &record)
         debugMessage("PWD RESULT: " + m_pwd);
     }
 }
+#endif
 
 void GdbEngine::handleQuerySources(const GdbResultRecord &record)
 {
@@ -1670,7 +1675,7 @@ bool GdbEngine::startDebugger()
     //sendCommand("handle SIGTERM pass nostop print");
 
     sendCommand("set unwindonsignal on");
-    sendCommand("pwd", GdbQueryPwd);
+    //sendCommand("pwd", GdbQueryPwd);
     sendCommand("set width 0");
     sendCommand("set height 0");
 
diff --git a/src/plugins/debugger/gdbengine.h b/src/plugins/debugger/gdbengine.h
index 5b12c8a7392d932ca8135d99222bf45391ade67d..b6df9ebb2c2debe5cb769f08abda5e857c99094d 100644
--- a/src/plugins/debugger/gdbengine.h
+++ b/src/plugins/debugger/gdbengine.h
@@ -140,7 +140,7 @@ private:
     //
 
     int currentFrame() const;
-    QString currentWorkingDirectory() const { return m_pwd; }
+    //QString currentWorkingDirectory() const { return m_pwd; }
 
     bool supportsThreads() const;
 
@@ -220,7 +220,7 @@ private:
     QByteArray m_pendingConsoleStreamOutput;
     QByteArray m_pendingTargetStreamOutput;
     QByteArray m_pendingLogStreamOutput;
-    QString m_pwd;
+    //QString m_pwd;
 
     // contains the first token number for the current round
     // of evaluation. Responses with older tokens are considers