diff --git a/languages/clang/kdevclangsupport.json b/languages/clang/kdevclangsupport.json
--- a/languages/clang/kdevclangsupport.json
+++ b/languages/clang/kdevclangsupport.json
@@ -53,7 +53,7 @@
     "X-KDevelop-Interfaces": [
         "ILanguageSupport"
     ], 
-    "X-KDevelop-Language": "C", 
+    "X-KDevelop-Languages": ["C", "C++", "Objective-C"], 
     "X-KDevelop-LoadMode": "AlwaysOn", 
     "X-KDevelop-Mode": "NoGUI", 
     "X-KDevelop-SupportedMimeTypes": [
diff --git a/languages/qmljs/kdevqmljs.json b/languages/qmljs/kdevqmljs.json
--- a/languages/qmljs/kdevqmljs.json
+++ b/languages/qmljs/kdevqmljs.json
@@ -34,7 +34,7 @@
     "X-KDevelop-Interfaces": [
         "ILanguageSupport"
     ], 
-    "X-KDevelop-Language": "QML/JS", 
+    "X-KDevelop-Languages": ["QML/JS"], 
     "X-KDevelop-Mode": "NoGUI", 
     "X-KDevelop-SupportedMimeTypes": [
         "text/x-qml", 
diff --git a/projectmanagers/cmake/kdevcmakedocumentation.json b/projectmanagers/cmake/kdevcmakedocumentation.json
--- a/projectmanagers/cmake/kdevcmakedocumentation.json
+++ b/projectmanagers/cmake/kdevcmakedocumentation.json
@@ -64,7 +64,6 @@
         "org.kdevelop.IDocumentationProvider", 
         "org.kdevelop.ICMakeDocumentation"
     ], 
-    "X-KDevelop-Language": "CMake", 
     "X-KDevelop-Mode": "GUI", 
     "X-KDevelop-SupportedMimeTypes": [
         "text/x-cmake"
diff --git a/projectmanagers/cmake/kdevcmakemanager.json b/projectmanagers/cmake/kdevcmakemanager.json
--- a/projectmanagers/cmake/kdevcmakemanager.json
+++ b/projectmanagers/cmake/kdevcmakemanager.json
@@ -68,7 +68,7 @@
         "org.kdevelop.IProjectFileManager", 
         "ILanguageSupport"
     ], 
-    "X-KDevelop-Language": "CMake", 
+    "X-KDevelop-Languages": ["CMake"], 
     "X-KDevelop-LoadMode": "AlwaysOn", 
     "X-KDevelop-Mode": "GUI", 
     "X-KDevelop-ProjectFilesFilter": [