diff --git a/share/images/icons/Apache JSPWiki.png b/share/images/icons/Apache JSPWiki.png
new file mode 100644
index 000000000..bb6f654ce
Binary files /dev/null and b/share/images/icons/Apache JSPWiki.png differ
diff --git a/share/js/apps.js b/share/js/apps.js
index ba25333d3..a8b4ad128 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -50,6 +50,7 @@
 		'Amiro.CMS':                        { cats: [  1 ], meta: { 'generator': /Amiro/i }, html: /system_js\.php(\?|\-)script=/, implies: [ 'PHP' ] },
 		'AOLserver':                        { cats: [ 22 ], headers: { 'Server': /AOLserver/i } },
 		'Apache':                           { cats: [ 22 ], headers: { 'Server': /(Apache($|[^-])|HTTPD)/i } },
+		'Apache JSPWiki':                   { cats: [  8 ], html: /<html[^>]* xmlns:jspwiki=/i },
 		'Apache Tomcat':                    { cats: [ 22 ], headers: { 'Server': /Apache-Coyote/i } },
 		'Apache Traffic Server':            { cats: [ 22 ], headers: { 'Server': /YTS/i } },
 		'Arc Forum':                        { cats: [  2 ], html: /ping\.src = node\.href;/ },