diff --git a/nselib/data/http-fingerprints.lua b/nselib/data/http-fingerprints.lua
index 002551542..94f8fe456 100644
--- a/nselib/data/http-fingerprints.lua
+++ b/nselib/data/http-fingerprints.lua
@@ -107,6 +107,38 @@ table.insert(fingerprints, {
 	}
 })
 
+table.insert(fingerprints, { 
+	category='general',
+	probes={
+		{path='/tikiwiki/', method='HEAD'}
+	}, 
+	matches={
+		{output='Tikiwiki'}
+	}
+})
+
+table.insert(fingerprints, {
+	category='general',
+	probes={
+		{path='/cgi-bin/mj_wwwusr', method='HEAD'},
+		{path='/majordomo/mj_wwwusr', method='HEAD'}
+	},
+	matches= {
+		{match='', output='Majordomo2 Mailing List'}
+	}
+})
+
+table.insert(fingerprints, {
+	category='general',
+	probes={
+		{path='/j2ee/examples/servlets/', method='HEAD'},
+                {path='/j2ee/examples/jsp/', method='HEAD'}
+	},
+	matches= {
+		{match='', output='Oracle j2ee examples'}
+	}
+})
+
 table.insert(fingerprints, {
 	category='general',
 	probes={
@@ -267,6 +299,309 @@ table.insert(fingerprints, {
 		{path='/adm_auth.php', method='HEAD'},
 		{path='/memberadmin.php', method='HEAD'},
 		{path='/administratorlogin.php', method='HEAD'},
+		{path='/account.cfm', method='HEAD'},
+		{path='/admin/account.cfm', method='HEAD'},
+		{path='/admin/index.cfm', method='HEAD'},
+		{path='/admin/login.cfm', method='HEAD'},
+		{path='/admin/admin.cfm', method='HEAD'},
+		{path='/admin.cfm', method='HEAD'},
+		{path='/admin/admin_login.cfm', method='HEAD'},
+		{path='/admin_login.cfm', method='HEAD'},
+		{path='/adminpanel.cfm', method='HEAD'},
+		{path='/admin/controlpanel.cfm', method='HEAD'},
+		{path='/admincontrol.cfm', method='HEAD'},
+		{path='/panel-administracion/login.cfm', method='HEAD'},
+		{path='/admin/cp.cfm', method='HEAD'},
+		{path='/pages/admin/admin-login.cfm', method='HEAD'},
+		{path='/admincp/index.cfm', method='HEAD'},
+		{path='/admincp/login.cfm', method='HEAD'},
+		{path='/admin_area/admin.cfm', method='HEAD'},
+		{path='/admin_area/login.cfm', method='HEAD'},
+		{path='/moderator/login.cfm', method='HEAD'},
+		{path='/administrator/login.cfm', method='HEAD'},
+		{path='/moderator.cfm', method='HEAD'},
+		{path='/modelsearch/index.cfm', method='HEAD'},
+		{path='/panel-administracion/admin.cfm', method='HEAD'},
+		{path='/adm/admloginuser.cfm', method='HEAD'},
+		{path='/adm.cfm', method='HEAD'},
+		{path='/adm_auth.cfm', method='HEAD'},
+		{path='/administratorlogin.cfm', method='HEAD'},
+		{path='/webadmin.cfm', method='HEAD'},
+		{path='/webadmin/index.cfm', method='HEAD'},
+		{path='/modelsearch/login.cfm', method='HEAD'},
+		{path='/login.cfm', method='HEAD'},
+		{path='/administrator.cfm', method='HEAD'},
+		{path='/administrator/account.cfm', method='HEAD'},
+		{path='/adminLogin.cfm', method='HEAD'},
+		{path='/siteadmin/login.cfm', method='HEAD'},
+		{path='/admin2/index.cfm', method='HEAD'},
+		{path='/adm/index.cfm', method='HEAD'},
+		{path='/admin_area/index.cfm', method='HEAD'},
+		{path='/bb-admin/index.cfm', method='HEAD'},
+		{path='/bb-admin/login.cfm', method='HEAD'},
+		{path='/bb-admin/admin.cfm', method='HEAD'},
+		{path='/siteadmin/index.cfm', method='HEAD'},
+		{path='/memberadmin.cfm', method='HEAD'},
+		{path='/admin2/login.cfm', method='HEAD'},
+		{path='/admloginuser.cfm', method='HEAD'},
+		{path='/admincontrol/login.cfm', method='HEAD'},
+		{path='/administrator/index.cfm', method='HEAD'},
+		{path='/modelsearch/admin.cfm', method='HEAD'},
+		{path='/panel-administracion/index.cfm', method='HEAD'},
+		{path='/adminarea/login.cfm', method='HEAD'},
+		{path='/adminarea/admin.cfm', method='HEAD'},
+		{path='/adminarea/index.cfm', method='HEAD'},
+		{path='/admin/adminLogin.cfm', method='HEAD'},
+		{path='/webadmin/login.cfm', method='HEAD'},
+		{path='/webadmin/admin.cfm', method='HEAD'},
+		{path='/user.cfm', method='HEAD'},
+		{path='/controlpanel.cfm', method='HEAD'},
+		{path='/moderator/admin.cfm', method='HEAD'},
+		{path='/cp.cfm', method='HEAD'},
+		{path='/admin-login.cfm', method='HEAD'},
+		{path='/admin/admin-login.cfm', method='HEAD'},
+		{path='/admin/home.cfm', method='HEAD'},
+		{path='/adm1n/', method='HEAD'},
+		{path='/4dm1n/', method='HEAD'},
+		{path='/account.asp', method='HEAD'},
+		{path='/admin/account.asp', method='HEAD'},
+		{path='/admin/index.asp', method='HEAD'},
+		{path='/admin/login.asp', method='HEAD'},
+		{path='/admin/admin.asp', method='HEAD'},
+		{path='/admin_area/admin.asp', method='HEAD'},
+		{path='/admin_area/login.asp', method='HEAD'},
+		{path='/admin_area/index.asp', method='HEAD'},
+		{path='/bb-admin/index.asp', method='HEAD'},
+		{path='/bb-admin/login.asp', method='HEAD'},
+		{path='/bb-admin/admin.asp', method='HEAD'},
+		{path='/admin/home.asp', method='HEAD'},
+		{path='/admin/controlpanel.asp', method='HEAD'},
+		{path='/admin.asp', method='HEAD'},
+		{path='/pages/admin/admin-login.asp', method='HEAD'},
+		{path='/admin/admin-login.asp', method='HEAD'},
+		{path='/admin-login.asp', method='HEAD'},
+		{path='/admin/cp.asp', method='HEAD'},
+		{path='/cp.asp', method='HEAD'},
+		{path='/administrator/account.asp', method='HEAD'},
+		{path='/administrator.asp', method='HEAD'},
+		{path='/login.asp', method='HEAD'},
+		{path='/modelsearch/login.asp', method='HEAD'},
+		{path='/moderator.asp', method='HEAD'},
+		{path='/moderator/login.asp', method='HEAD'},
+		{path='/administrator/login.asp', method='HEAD'},
+		{path='/moderator/admin.asp', method='HEAD'},
+		{path='/controlpanel.asp', method='HEAD'},
+		{path='/user.asp', method='HEAD'},
+		{path='/admincp/index.asp', method='HEAD'},
+		{path='/admincp/login.asp', method='HEAD'},
+		{path='/admincontrol.asp', method='HEAD'},
+		{path='/admin/account.asp', method='HEAD'},
+		{path='/adminpanel.asp', method='HEAD'},
+		{path='/webadmin.asp', method='HEAD'},
+		{path='/webadmin/index.asp', method='HEAD'},
+		{path='/webadmin/admin.asp', method='HEAD'},
+		{path='/webadmin/login.asp', method='HEAD'},
+		{path='/admin/admin_login.asp', method='HEAD'},
+		{path='/admin_login.asp', method='HEAD'},
+		{path='/panel-administracion/login.asp', method='HEAD'},
+		{path='/adminLogin.asp', method='HEAD'},
+		{path='/admin/adminLogin.asp', method='HEAD'},
+		{path='/home.asp', method='HEAD'},
+		{path='/adminarea/index.asp', method='HEAD'},
+		{path='/adminarea/admin.asp', method='HEAD'},
+		{path='/adminarea/login.asp', method='HEAD'},
+		{path='/panel-administracion/index.asp', method='HEAD'},
+		{path='/panel-administracion/admin.asp', method='HEAD'},
+		{path='/modelsearch/index.asp', method='HEAD'},
+		{path='/modelsearch/admin.asp', method='HEAD'},
+		{path='/administrator/index.asp', method='HEAD'},
+		{path='/admincontrol/login.asp', method='HEAD'},
+		{path='/adm/admloginuser.asp', method='HEAD'},
+		{path='/admloginuser.asp', method='HEAD'},
+		{path='/admin2.asp', method='HEAD'},
+		{path='/admin2/login.asp', method='HEAD'},
+		{path='/admin2/index.asp', method='HEAD'},
+		{path='/adm/index.asp', method='HEAD'},
+		{path='/adm.asp', method='HEAD'},
+		{path='/adm_auth.asp', method='HEAD'},
+		{path='/memberadmin.asp', method='HEAD'},
+		{path='/administratorlogin.asp', method='HEAD'},
+		{path='/siteadmin/login.asp', method='HEAD'},
+		{path='/siteadmin/index.asp', method='HEAD'},
+		{path='/account.aspx', method='HEAD'},
+		{path='/admin/account.aspx', method='HEAD'},
+		{path='/admin/index.aspx', method='HEAD'},
+		{path='/admin/login.aspx', method='HEAD'},
+		{path='/admin/admin.aspx', method='HEAD'},
+		{path='/admin_area/admin.aspx', method='HEAD'},
+		{path='/admin_area/login.aspx', method='HEAD'},
+		{path='/admin_area/index.aspx', method='HEAD'},
+		{path='/bb-admin/index.aspx', method='HEAD'},
+		{path='/bb-admin/login.aspx', method='HEAD'},
+		{path='/bb-admin/admin.aspx', method='HEAD'},
+		{path='/admin/home.aspx', method='HEAD'},
+		{path='/admin/controlpanel.aspx', method='HEAD'},
+		{path='/admin.aspx', method='HEAD'},
+		{path='/pages/admin/admin-login.aspx', method='HEAD'},
+		{path='/admin/admin-login.aspx', method='HEAD'},
+		{path='/admin-login.aspx', method='HEAD'},
+		{path='/admin/cp.aspx', method='HEAD'},
+		{path='/cp.aspx', method='HEAD'},
+		{path='/administrator/account.aspx', method='HEAD'},
+		{path='/administrator.aspx', method='HEAD'},
+		{path='/login.aspx', method='HEAD'},
+		{path='/modelsearch/login.aspx', method='HEAD'},
+		{path='/moderator.aspx', method='HEAD'},
+		{path='/moderator/login.aspx', method='HEAD'},
+		{path='/administrator/login.aspx', method='HEAD'},
+		{path='/moderator/admin.aspx', method='HEAD'},
+		{path='/controlpanel.aspx', method='HEAD'},
+		{path='/user.aspx', method='HEAD'},
+		{path='/admincp/index.aspx', method='HEAD'},
+		{path='/admincp/login.aspx', method='HEAD'},
+		{path='/admincontrol.aspx', method='HEAD'},
+		{path='/admin/account.aspx', method='HEAD'},
+		{path='/adminpanel.aspx', method='HEAD'},
+		{path='/webadmin.aspx', method='HEAD'},
+		{path='/webadmin/index.aspx', method='HEAD'},
+		{path='/webadmin/admin.aspx', method='HEAD'},
+		{path='/webadmin/login.aspx', method='HEAD'},
+		{path='/admin/admin_login.aspx', method='HEAD'},
+		{path='/admin_login.aspx', method='HEAD'},
+		{path='/panel-administracion/login.aspx', method='HEAD'},
+		{path='/adminLogin.aspx', method='HEAD'},
+		{path='/admin/adminLogin.aspx', method='HEAD'},
+		{path='/home.aspx', method='HEAD'},
+		{path='/adminarea/index.aspx', method='HEAD'},
+		{path='/adminarea/admin.aspx', method='HEAD'},
+		{path='/adminarea/login.aspx', method='HEAD'},
+		{path='/panel-administracion/index.aspx', method='HEAD'},
+		{path='/panel-administracion/admin.aspx', method='HEAD'},
+		{path='/modelsearch/index.aspx', method='HEAD'},
+		{path='/modelsearch/admin.aspx', method='HEAD'},
+		{path='/administrator/index.aspx', method='HEAD'},
+		{path='/admincontrol/login.aspx', method='HEAD'},
+		{path='/adm/admloginuser.aspx', method='HEAD'},
+		{path='/admloginuser.aspx', method='HEAD'},
+		{path='/admin2.aspx', method='HEAD'},
+		{path='/admin2/login.aspx', method='HEAD'},
+		{path='/admin2/index.aspx', method='HEAD'},
+		{path='/adm/index.aspx', method='HEAD'},
+		{path='/adm.aspx', method='HEAD'},
+		{path='/adm_auth.aspx', method='HEAD'},
+		{path='/memberadmin.aspx', method='HEAD'},
+		{path='/administratorlogin.aspx', method='HEAD'},
+		{path='/siteadmin/login.aspx', method='HEAD'},
+		{path='/siteadmin/index.aspx', method='HEAD'},
+		{path='/account.jsp', method='HEAD'},
+		{path='/admin/account.jsp', method='HEAD'},
+		{path='/admin/index.jsp', method='HEAD'},
+		{path='/admin/login.jsp', method='HEAD'},
+		{path='/admin/admin.jsp', method='HEAD'},
+		{path='/admin_area/admin.jsp', method='HEAD'},
+		{path='/admin_area/login.jsp', method='HEAD'},
+		{path='/admin_area/index.jsp', method='HEAD'},
+		{path='/bb-admin/index.jsp', method='HEAD'},
+		{path='/bb-admin/login.jsp', method='HEAD'},
+		{path='/bb-admin/admin.jsp', method='HEAD'},
+		{path='/admin/home.jsp', method='HEAD'},
+		{path='/admin/controlpanel.jsp', method='HEAD'},
+		{path='/admin.jsp', method='HEAD'},
+		{path='/pages/admin/admin-login.jsp', method='HEAD'},
+		{path='/admin/admin-login.jsp', method='HEAD'},
+		{path='/admin-login.jsp', method='HEAD'},
+		{path='/admin/cp.jsp', method='HEAD'},
+		{path='/cp.jsp', method='HEAD'},
+		{path='/administrator/account.jsp', method='HEAD'},
+		{path='/administrator.jsp', method='HEAD'},
+		{path='/login.jsp', method='HEAD'},
+		{path='/modelsearch/login.jsp', method='HEAD'},
+		{path='/moderator.jsp', method='HEAD'},
+		{path='/moderator/login.jsp', method='HEAD'},
+		{path='/administrator/login.jsp', method='HEAD'},
+		{path='/moderator/admin.jsp', method='HEAD'},
+		{path='/controlpanel.jsp', method='HEAD'},
+		{path='/user.jsp', method='HEAD'},
+		{path='/admincp/index.jsp', method='HEAD'},
+		{path='/admincp/login.jsp', method='HEAD'},
+		{path='/admincontrol.jsp', method='HEAD'},
+		{path='/admin/account.jsp', method='HEAD'},
+		{path='/adminpanel.jsp', method='HEAD'},
+		{path='/webadmin.jsp', method='HEAD'},
+		{path='/webadmin/index.jsp', method='HEAD'},
+		{path='/webadmin/admin.jsp', method='HEAD'},
+		{path='/webadmin/login.jsp', method='HEAD'},
+		{path='/admin/admin_login.jsp', method='HEAD'},
+		{path='/admin_login.jsp', method='HEAD'},
+		{path='/panel-administracion/login.jsp', method='HEAD'},
+		{path='/adminLogin.jsp', method='HEAD'},
+		{path='/admin/adminLogin.jsp', method='HEAD'},
+		{path='/home.jsp', method='HEAD'},
+		{path='/adminarea/index.jsp', method='HEAD'},
+		{path='/adminarea/admin.jsp', method='HEAD'},
+		{path='/adminarea/login.jsp', method='HEAD'},
+		{path='/panel-administracion/index.jsp', method='HEAD'},
+		{path='/panel-administracion/admin.jsp', method='HEAD'},
+		{path='/modelsearch/index.jsp', method='HEAD'},
+		{path='/modelsearch/admin.jsp', method='HEAD'},
+		{path='/administrator/index.jsp', method='HEAD'},
+		{path='/admincontrol/login.jsp', method='HEAD'},
+		{path='/adm/admloginuser.jsp', method='HEAD'},
+		{path='/admloginuser.jsp', method='HEAD'},
+		{path='/admin2.jsp', method='HEAD'},
+		{path='/admin2/login.jsp', method='HEAD'},
+		{path='/admin2/index.jsp', method='HEAD'},
+		{path='/adm/index.jsp', method='HEAD'},
+		{path='/adm.jsp', method='HEAD'},
+		{path='/adm_auth.jsp', method='HEAD'},
+		{path='/memberadmin.jsp', method='HEAD'},
+		{path='/administratorlogin.jsp', method='HEAD'},
+		{path='/siteadmin/login.jsp', method='HEAD'},
+		{path='/siteadmin/index.jsp', method='HEAD'},
+		{path='/admin1.php', method='HEAD'},
+		{path='/administr8.asp', method='HEAD'},
+		{path='/administr8.php', method='HEAD'},
+		{path='/administr8.jsp', method='HEAD'},
+		{path='/administr8.aspx', method='HEAD'},
+		{path='/administr8.cfm', method='HEAD'},
+		{path='/administr8/', method='HEAD'},
+		{path='/administer/', method='HEAD'},
+		{path='/administracao.php', method='HEAD'},
+		{path='/administracao.asp', method='HEAD'},
+		{path='/administracao.aspx', method='HEAD'},
+		{path='/administracao.cfm', method='HEAD'},
+		{path='/administracao.jsp', method='HEAD'},
+		{path='/administracion.php', method='HEAD'},
+		{path='/administracion.asp', method='HEAD'},
+		{path='/administracion.aspx', method='HEAD'},
+		{path='/administracion.jsp', method='HEAD'},
+		{path='/administracion.cfm', method='HEAD'},
+		{path='/administrators/', method='HEAD'},
+		{path='/adminpro/', method='HEAD'},
+		{path='/admins/', method='HEAD'},
+		{path='/admins.cfm', method='HEAD'},
+		{path='/admins.php', method='HEAD'},
+		{path='/admins.jsp', method='HEAD'},
+		{path='/admins.asp', method='HEAD'},
+		{path='/admins.aspx', method='HEAD'},
+		{path='/maintenance/', method='HEAD'},
+		{path='/Lotus_Domino_Admin/', method='HEAD'},
+		{path='/hpwebjetadmin/', method='HEAD'},
+		{path='/_admin/', method='HEAD'},
+		{path='/_administrator/', method='HEAD'},
+		{path='/_administrador/', method='HEAD'},
+		{path='/_admins/', method='HEAD'},
+		{path='/_administrators/', method='HEAD'},
+		{path='/_administradores/', method='HEAD'},
+		{path='/_administracion/', method='HEAD'},
+		{path='/_4dm1n/', method='HEAD'},
+		{path='/_adm1n/', method='HEAD'},
+		{path='/system_administration/', method='HEAD'},
+		{path='/system-administration/', method='HEAD'},
+		{path='/system-admin/', method='HEAD'},
+		{path='/system-admins/', method='HEAD'},
+		{path='/system-administrators/', method='HEAD'},
+		{path='/administracion-sistema/', method='HEAD'},
 	}, 
 	matches={
 		{match='<title>Index of', output='Possible admin folder w/ directory listing'},
@@ -725,9 +1060,22 @@ table.insert(fingerprints, {
 	probes={
 		{path='/manager/', method='HEAD'},
 		{path='/manager/html/upload', method='HEAD'},
+                {path='/manager/html', method='HEAD'}
 	},
 	matches= {
-		{match='', output='Tomcat manager (possibly)'}
+		{match='', output='Apache Tomcat'}
+	}
+})
+
+table.insert(fingerprints, {
+	category='general',
+	probes={
+		{path='/axis2/axis2-web/HappyAxis.jsp', method='HEAD'},
+		{path='/axis2/', method='HEAD'},
+                {path='/happyaxis.jsp', method='HEAD'}
+	},
+	matches= {
+		{match='', output='Apache Axis2'}
 	}
 })
 
@@ -736,6 +1084,7 @@ table.insert(fingerprints, {
 	probes={
 		{path='/web-console/ServerInfo.jsp', method='HEAD'},
 		{path='/jmx-console/', method='HEAD'},
+		{path='/admin-console/', method='HEAD'}
 	},
 	matches= {
 		{match='', output='JBOSS Console'}
@@ -1097,7 +1446,15 @@ table.insert(fingerprints, {
 	}
 })
 
-
+table.insert(fingerprints, {
+	category='microsoft',
+	probes={
+		{path='/reportserver/', method='HEAD'}
+	},
+	matches= {
+		{match='', output='Microsoft SQL Report Service'}
+	}
+})
 ------------------------------------------------
 ----         NETWORK EQUIPMENT              ----
 ------------------------------------------------
@@ -1269,6 +1626,7 @@ table.insert(fingerprints, {
                 {path='/wp-login.php'},
                 {path='/wordpress/wp-login.php'},
                 {path='/blog/wp-login.php'},
+                {path='/administrator/wp-login.php'},
                 {path='/weblog/wp-login.php'}
         },
         matches={