diff --git a/share/apps.json b/share/apps.json
index a1e65aaf3..991a75248 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -2867,8 +2867,8 @@
 			"meta": { "generator": "typepad" },
 			"url": "typepad\\.com"
 		},
-		"TYPO3": {
-			"website": "typo3.com",
+		"TYPO3 CMS": {
+			"website": "typo3.org",
 			"cats": [ 1 ],
 			"headers": { "Set-Cookie": "fe_typo_user" },
 			"meta": { "generator": "TYPO3\\s?([\\d.]+)?\\;version:\\1" },
@@ -2876,6 +2876,19 @@
 			"url": "/typo3/",
 			"implies": "PHP"
 		},
+		"TYPO3 Flow": {
+			"website": "flow.typo3.org",
+			"cats": [ 18 ],
+			"headers": { "X-Flow-Powered": "Flow\\/(.+)?$\\;version:\\1" },
+			"implies": "PHP"
+		},
+		"TYPO3 Neos": {
+			"website": "neos.typo3.org",
+			"cats": [ 1 ],
+			"html": "xmlns:typo3=\\\"http:\\/\\/www\\.typo3\\.org\\/ns\\/[0-9]{4}\\/Flow\\/Packages\\/Neos\\/Content\\/",
+			"url": "/neos/",
+			"implies": [ "PHP", "TYPO3 Flow" ]
+		},
 		"Ubercart": {
 			"website": "www.ubercart.org",
 			"cats": [ 6 ],
diff --git a/share/images/icons/TYPO3.png b/share/images/icons/TYPO3 CMS.png
similarity index 100%
rename from share/images/icons/TYPO3.png
rename to share/images/icons/TYPO3 CMS.png
diff --git a/share/images/icons/TYPO3 Flow.png b/share/images/icons/TYPO3 Flow.png
new file mode 100644
index 000000000..f9e86544e
Binary files /dev/null and b/share/images/icons/TYPO3 Flow.png differ
diff --git a/share/images/icons/TYPO3 Neos.png b/share/images/icons/TYPO3 Neos.png
new file mode 100644
index 000000000..f9e86544e
Binary files /dev/null and b/share/images/icons/TYPO3 Neos.png differ