diff --git a/share/apps.json b/share/apps.json
index 5a55a1a22..0f7c620b1 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -620,6 +620,15 @@
 			"script": "scripts\\.chitika\\.net/",
 			"env": "ch_c(?:lient|olor_site_link)"
 		},
+		"Ckan": {
+			"website": "ckan.org/",
+			"cats": [ 1 ],
+			"headers": { 
+				"Access-Control-Allow-Headers": "X-CKAN-API-KEY",
+                "Link": "<http://ckan.org/>; rel=shortlink" 
+            },
+            "implies": [ "Python", "Solr", "Java", "PostgreSQL\\;confidence:80" ]
+		},
 		"CKEditor": {
 			"website": "ckeditor.com",
 			"cats": [ 24 ],
@@ -2121,6 +2130,10 @@
 			"cats": [ 27 ],
 			"headers": { "X-Powered-By": "\\bLua(?: ([\\d.]+))?\\;version:\\1" }
 		},
+		"Lucene": {
+			"website": "lucene.apache.org/core/",
+			"cats": [ 34 ]
+		},
 		"M.R. Inc Webserver": {
 			"website": "mrincworld.com",
 			"cats": [ 22 ],
@@ -2599,6 +2612,16 @@
 			"html": "(?:index\\.php\\?route=[a-z]+/|Powered By <a href=\"[^>]+OpenCart)",
 			"implies": "PHP"
 		},
+		"OpenCms": {
+			"website": "www.opencms.org",
+			"cats": [ 1 ],
+			"html": "<link href=\"/opencms/",
+			"script": "opencms",
+			"headers": {
+				"Server": "OpenCms"
+			},
+			"implies": "Java"
+		},
 		"openEngine": {
 			"website": "openengine.de/html/pages/de/",
 			"cats": [ 1 ],
@@ -2933,6 +2956,10 @@
 			"html": "<div class=\"posterous",
 			"env": "^Posterous"
 		},
+		"PostgreSQL": {
+			"website": "www.postgresql.org/",
+			"cats": [ 34 ]
+		},
 		"Powergap": {
 			"website": "powergap.de",
 			"cats": [ 6 ],
@@ -3397,6 +3424,11 @@
 			"html": "<div class='dynamicDiv' id='dd\\.\\d\\.\\d'>",
 			"implies": "PHP"
 		},
+		"Solr": {
+			"website": "lucene.apache.org/solr/",
+			"cats": [ 34 ],
+			"implies": "Lucene"
+		},
 		"SPDY": {
 			"website": "chromium.org/spdy",
 			"cats": [ 19 ],
diff --git a/share/images/icons/OpenCms.png b/share/images/icons/OpenCms.png
new file mode 100644
index 000000000..8bc220a88
Binary files /dev/null and b/share/images/icons/OpenCms.png differ
diff --git a/share/images/icons/ckan.png b/share/images/icons/ckan.png
new file mode 100644
index 000000000..567ec4c80
Binary files /dev/null and b/share/images/icons/ckan.png differ