diff --git a/share/apps.json b/share/apps.json
index 6a667762a..f021028d1 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -715,6 +715,16 @@
 			"meta": { "generator": "CPG Dragonfly" },
 			"implies": "PHP"
 		},
+        	"C++": {
+            		"website": "isocpp.org",
+            		"cats": [ 27 ]
+		},
+        	"CppCMS": {
+            		"website": "cppcms.com",
+            		"cats": [ 1 ],
+            		"headers": { "X-Powered-By": "CppCMS/([\\d.]+)\\;version:\\1" },
+            		"implies": "C++"
+		},
 		"Craft CMS": {
 			"website": "buildwithcraft.com",
 			"cats": [ 1 ],
diff --git a/share/images/icons/C++.png b/share/images/icons/C++.png
new file mode 100644
index 000000000..bfb1f9856
Binary files /dev/null and b/share/images/icons/C++.png differ
diff --git a/share/images/icons/CppCMS.png b/share/images/icons/CppCMS.png
new file mode 100644
index 000000000..b745d7353
Binary files /dev/null and b/share/images/icons/CppCMS.png differ