diff --git a/share/apps.json b/share/apps.json
index 023b11520..4a3e79299 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -698,6 +698,12 @@
 			"meta": { "generator": "CPG Dragonfly" },
 			"implies": "PHP"
 		},
+		"Craft CMS": {
+			"website": "buildwithcraft.com",
+			"cats": [ 1 ],
+			"headers": { "Set-Cookie": "CraftSessionId=" },
+			"implies": "PHP"
+		},
 		"Crazy Egg": {
 			"website": "crazyegg.com",
 			"cats": [ 10 ],
diff --git a/share/images/icons/craft_cms.png b/share/images/icons/craft_cms.png
new file mode 100644
index 000000000..115d73f9c
Binary files /dev/null and b/share/images/icons/craft_cms.png differ