diff --git a/src/apps.json b/src/apps.json
index 68e00a36c..0e7f63269 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -5447,6 +5447,18 @@
 			"script": "protovis.*\\.js",
 			"website": "mbostock.github.com/protovis"
 		},
+		"Public CMS": {
+			"cats": [
+				1
+			],
+			"headers": {
+				"Set-Cookie": "PUBLICCMS_USER",
+				"X-Powered-PublicCMS": ""
+			},
+			"icon": "Public CMS.png",
+			"implies": "Java",
+			"website": "www.publiccms.com"
+		},
 		"PubMatic": {
 			"cats": [
 				36
@@ -6686,6 +6698,17 @@
 			"icon": "SyntaxHighlighter.png",
 			"website": "github.com/syntaxhighlighter"
 		},
+		"ThinkPHP": {
+			"cats": [
+				18
+			],
+			"headers": {
+				"X-Powered-By": "ThinkPHP"
+			},
+			"implies": "PHP",
+			"icon": "ThinkPHP.png",
+			"website": "www.thinkphp.cn"
+		},
 		"TWiki": {
 			"cats": [
 				8
diff --git a/src/icons/Public CMS.png b/src/icons/Public CMS.png
new file mode 100644
index 000000000..7a25b47fe
Binary files /dev/null and b/src/icons/Public CMS.png differ
diff --git a/src/icons/ThinkPHP.png b/src/icons/ThinkPHP.png
new file mode 100644
index 000000000..4f8c577ac
Binary files /dev/null and b/src/icons/ThinkPHP.png differ