diff --git a/src/tools/3rdparty/3rdparty.pro b/src/tools/3rdparty/3rdparty.pro
index c0c053bf4c6..a173e5dd58a 100644
--- a/src/tools/3rdparty/3rdparty.pro
+++ b/src/tools/3rdparty/3rdparty.pro
@@ -5,3 +5,6 @@ mac {
     iossim \
     iossim_1_8_2
 }
+
+isEmpty(BUILD_CPLUSPLUS_TOOLS):BUILD_CPLUSPLUS_TOOLS=$$(BUILD_CPLUSPLUS_TOOLS)
+!isEmpty(BUILD_CPLUSPLUS_TOOLS): SUBDIRS += cplusplus-keywordgen
diff --git a/src/tools/cplusplus-keywordgen/cplusplus-keywordgen.cpp b/src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.cpp
similarity index 100%
rename from src/tools/cplusplus-keywordgen/cplusplus-keywordgen.cpp
rename to src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.cpp
diff --git a/src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.pro b/src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.pro
new file mode 100644
index 00000000000..5c61e999c9a
--- /dev/null
+++ b/src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.pro
@@ -0,0 +1,3 @@
+include(../../cplusplus-shared/tool.pri)
+
+SOURCES += cplusplus-keywordgen.cpp
diff --git a/src/tools/cplusplus-keywordgen/cplusplus-keywordgen.qbs b/src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.qbs
similarity index 57%
rename from src/tools/cplusplus-keywordgen/cplusplus-keywordgen.qbs
rename to src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.qbs
index a101414e2e1..a57eb3dfd58 100644
--- a/src/tools/cplusplus-keywordgen/cplusplus-keywordgen.qbs
+++ b/src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.qbs
@@ -1,4 +1,4 @@
-import "../cplusplus-shared/CPlusPlusTool.qbs" as CPlusPlusTool
+import "../../cplusplus-shared/CPlusPlusTool.qbs" as CPlusPlusTool
 
 CPlusPlusTool {
     name: "cplusplus-keywordgen"
diff --git a/src/tools/cplusplus-keywordgen/cplusplus-keywordgen.pro b/src/tools/cplusplus-keywordgen/cplusplus-keywordgen.pro
deleted file mode 100644
index 7d647775398..00000000000
--- a/src/tools/cplusplus-keywordgen/cplusplus-keywordgen.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../cplusplus-shared/tool.pri)
-
-SOURCES += cplusplus-keywordgen.cpp
diff --git a/src/tools/cplusplustools.qbs b/src/tools/cplusplustools.qbs
index 766c150a74d..b3e61cf9de0 100644
--- a/src/tools/cplusplustools.qbs
+++ b/src/tools/cplusplustools.qbs
@@ -2,9 +2,9 @@ Project {
     name: "CPlusPlus Tools"
     condition: qbs.getEnv("BUILD_CPLUSPLUS_TOOLS")
     references: [
+        "3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.qbs",
         "cplusplus-ast2png/cplusplus-ast2png.qbs",
         "cplusplus-frontend/cplusplus-frontend.qbs",
-        "cplusplus-keywordgen/cplusplus-keywordgen.qbs",
         "cplusplus-mkvisitor/cplusplus-mkvisitor.qbs",
         "cplusplus-update-frontend/cplusplus-update-frontend.qbs",
     ]
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 6e82be45c60..fe9f3a73970 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -27,7 +27,6 @@ isEmpty(BUILD_CPLUSPLUS_TOOLS):BUILD_CPLUSPLUS_TOOLS=$$(BUILD_CPLUSPLUS_TOOLS)
 !isEmpty(BUILD_CPLUSPLUS_TOOLS) {
     SUBDIRS += cplusplus-ast2png \
         cplusplus-frontend \
-        cplusplus-keywordgen \
         cplusplus-mkvisitor \
         cplusplus-update-frontend
 }