diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 4958b1be8d4..d1e33b2b646 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -38,6 +38,7 @@
 
 #include <debugger/debuggerrunconfigurationaspect.h>
 #include <projectexplorer/target.h>
+#include <qtsupport/qtkitinformation.h>
 #include <utils/qtcassert.h>
 
 #include <QTime>
@@ -94,6 +95,10 @@ AndroidRunner::AndroidRunner(QObject *parent,
     m_pongFile = _("/data/local/tmp/qt/debug-pong-") + m_packageName;
     m_gdbserverSocket = packageDir + _("/debug-socket");
     m_gdbserverPath = packageDir + _("/lib/gdbserver");
+    const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit());
+    if (version && version->qtVersion() >=  QtSupport::QtVersionNumber(5, 4, 0))
+        m_gdbserverPath += _(".so");
+
     m_gdbserverCommand = m_gdbserverPath + _(" --multi +") + m_gdbserverSocket;
     // Detect busybox, as we need to pass -w to ps to get wide output.
     QProcess psProc;