diff --git a/share/apps.json b/share/apps.json
index 260e09947..96882d877 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -929,6 +929,12 @@
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
+		"Fat-Free Framework": {
+			"website": "fatfreeframework.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Fat-Free Framework" },
+			"implies": [ "PHP" ]
+		},
 		"Fedora": {
 			"website": "fedoraproject.org",
 			"cats": [ 28 ],
diff --git a/share/images/icons/Fat-Free Framework.png b/share/images/icons/Fat-Free Framework.png
new file mode 100644
index 000000000..e1073ef8b
Binary files /dev/null and b/share/images/icons/Fat-Free Framework.png differ