recog 2.3.15 → 2.3.20

data/xml/ftp_banners.xml

@@ -360,10 +360,11 @@ example.com FTP server (Version:  Mac OS X Server) ready.</example>
     <example service.version="1.0.11">=(&lt;*&gt;)=-.:. (( Welcome to Pure-FTPd 1.0.11 )) .:.-=(&lt;*&gt;)=-</example>
     <example service.version="1.0.11">=(&lt;*&gt;)=-.:. (( Welcome to Pure-FTPd 1.0.11 )) .:.-=(&lt;*&gt;)=-&#13;
 more stuff</example>
-    <param pos="0" name="service.fvendor" value="PureFTPd"/>
+    <param pos="0" name="service.vendor" value="PureFTPd"/>
     <param pos="0" name="service.family" value="Pure-FTPd"/>
     <param pos="0" name="service.product" value="Pure-FTPd"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:pureftpd:pure-ftpd:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^-{9,10}(?:.*)\s+Pure-FTPd\s+(.*)-{9,10}">
@@ -403,8 +404,6 @@ more text</example>
     <param pos="0" name="service.cpe23" value="cpe:/a:pureftpd:pure-ftpd:{service.version}"/>
   </fingerprint>
 
-  <!-- CPEs for Serv-U 15.x and above changed to SolarWinds -->
-
   <fingerprint pattern="^Serv-U FTP Server v(15\.\S+) ready\.\.\.$">
     <description>SolarWinds Serv-U with version </description>
     <example service.version="15.1.3.25">Serv-U FTP Server v15.1.3.25 ready...</example>
@@ -420,10 +419,10 @@ more text</example>
     <example service.version="2.5n">Serv-U FTP-Server v2.5n for WinSock ready...</example>
     <example service.version="6.0">Serv-U FTP Server v6.0 for WinSock ready</example>
     <param pos="0" name="service.vendor" value="Serv-U"/>
-    <param pos="0" name="service.product" value="Serv-U"/>
+    <param pos="0" name="service.product" value="Serv-U FTP Server"/>
     <param pos="0" name="service.family" value="Serv-U"/>
     <param pos="1" name="service.version"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:serv-u:serv-u:{service.version}"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:serv-u_ftp_server:{service.version}"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows"/>
@@ -435,10 +434,10 @@ more text</example>
     <example service.version="7.2">Serv-U FTP Server v7.2 ready...</example>
     <example service.version="14.0">Serv-U FTP Server v14.0 ready...</example>
     <param pos="0" name="service.vendor" value="Serv-U"/>
-    <param pos="0" name="service.product" value="Serv-U"/>
+    <param pos="0" name="service.product" value="Serv-U FTP Server"/>
     <param pos="0" name="service.family" value="Serv-U"/>
     <param pos="1" name="service.version"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:serv-u:serv-u:{service.version}"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:serv-u_ftp_server:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Welcom to Serv-U FTP Server$">
@@ -522,9 +521,9 @@ more text</example>
     <param pos="0" name="service.vendor" value="APC"/>
     <param pos="0" name="service.product" value="FTP"/>
     <param pos="0" name="os.vendor" value="APC"/>
-    <param pos="0" name="os.device" value="Power device"/>
+    <param pos="0" name="os.device" value="Power Device"/>
     <param pos="0" name="hw.vendor" value="APC"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
   </fingerprint>
 
   <fingerprint pattern="^(\S+) Network Management Card AOS v(\d+\..+) FTP server ready\.$">
@@ -537,11 +536,11 @@ more text</example>
     <param pos="0" name="service.family" value="AOS"/>
     <param pos="2" name="service.version"/>
     <param pos="0" name="os.vendor" value="APC"/>
-    <param pos="0" name="os.device" value="Power device"/>
+    <param pos="0" name="os.device" value="Power Device"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
     <param pos="0" name="hw.vendor" value="APC"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
   </fingerprint>
 
   <fingerprint pattern="^(\S+) FTP server \(EMC-SNAS: ([^\)]+)\)(?: \S+)?$">
@@ -560,6 +559,7 @@ more text</example>
     <param pos="0" name="hw.vendor" value="EMC"/>
     <param pos="0" name="hw.device" value="Storage"/>
     <param pos="0" name="hw.product" value="Celerra"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:emc:celerra_network_attached_storage:-"/>
   </fingerprint>
 
   <fingerprint pattern="^JD FTP Server Ready.*$">
@@ -603,7 +603,7 @@ more text</example>
     <param pos="0" name="service.vendor" value="Blue Coat"/>
     <param pos="0" name="service.product" value="Proxy"/>
     <param pos="0" name="os.vendor" value="Blue Coat"/>
-    <param pos="0" name="os.device" value="Web proxy"/>
+    <param pos="0" name="os.device" value="Web Proxy"/>
   </fingerprint>
 
   <fingerprint pattern="^---freeFTPd 1.0---warFTPd 1.65---$">
@@ -634,7 +634,7 @@ more text</example>
     <param pos="0" name="os.vendor" value="IBM"/>
     <param pos="0" name="os.product" value="4690"/>
     <param pos="0" name="os.family" value="4690"/>
-    <param pos="0" name="os.device" value="Point of sale"/>
+    <param pos="0" name="os.device" value="Point of Sale"/>
   </fingerprint>
 
   <fingerprint pattern="^([^ ]+) NcFTPd Server \(licensed copy\) ready\.$">
@@ -651,7 +651,7 @@ more text</example>
     <example>hostname DCS-2100 FTP server ready.</example>
     <param pos="0" name="os.vendor" value="D-Link"/>
     <param pos="0" name="os.product" value="DCS-2100"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
 
@@ -682,12 +682,12 @@ more text</example>
     <example hw.product="233D" hw.version="4.48.4">AXIS 233D Network Dome Camera 4.48.4 (Mar 23 2010) ready.</example>
     <example hw.product="P1346" hw.version="5.50beta3">AXIS P1346 Network Camera 5.50beta3 (2014) ready</example>
     <param pos="0" name="hw.vendor" value="Axis"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="hw.version"/>
     <param pos="0" name="os.vendor" value="AXIS"/>
     <param pos="0" name="os.family" value="Linux"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="(?i)^AXIS (\S+) (?:(?:Mk II )?Video) (?:Encoder|Encoder Blade|Module|Server|Decoder) (\S+) .*">
@@ -732,7 +732,7 @@ more text</example>
     <example hw.product="560">AXIS 560 FTP Network Print Server V6.00 Jul 7 1999 ready.</example>
     <example hw.version="6.30.beta2">AXIS 5470e FTP Network Print Server V6.30.beta2 Sep 25 2002 ready.</example>
     <param pos="0" name="hw.vendor" value="Axis"/>
-    <param pos="0" name="hw.device" value="Print server"/>
+    <param pos="0" name="hw.device" value="Print Server"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="hw.version"/>
   </fingerprint>
@@ -986,7 +986,7 @@ more text</example>
     <example hw.product="10/100 +IPDS" os.version="1.0">LinkCom Xpress 10/100 +IPDS FTP version 1.0 ready</example>
     <param pos="0" name="hw.vendor" value="MPI Technologies"/>
     <param pos="0" name="hw.family" value="LinkCom Xpress"/>
-    <param pos="0" name="hw.device" value="Print server"/>
+    <param pos="0" name="hw.device" value="Print Server"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
@@ -996,7 +996,7 @@ more text</example>
     <example hw.product="EIO PRO 10">LinkCom Xpress EIO PRO 10</example>
     <param pos="0" name="hw.vendor" value="MPI Technologies"/>
     <param pos="0" name="hw.family" value="LinkCom Xpress"/>
-    <param pos="0" name="hw.device" value="Print server"/>
+    <param pos="0" name="hw.device" value="Print Server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
@@ -1039,7 +1039,7 @@ more text</example>
     <example>EUFSALE MarkNet X2011e FTP Server 4.20.21 ready.</example>
     <param pos="0" name="os.vendor" value="Lexmark"/>
     <param pos="0" name="os.family" value="MarkNet"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
@@ -1189,11 +1189,11 @@ more text</example>
     <example>ESI-2999A Version 6.30a.07 ready.</example>
     <param pos="0" name="os.vendor" value="Sybase"/>
     <param pos="0" name="os.family" value="Extended Systems ExtendNet"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
     <param pos="0" name="hw.family" value="Extended Systems ExtendNet"/>
-    <param pos="0" name="hw.device" value="Print server"/>
+    <param pos="0" name="hw.device" value="Print Server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
@@ -1233,7 +1233,7 @@ more text</example>
     <param pos="0" name="service.product" value="Fiery Print Server"/>
     <param pos="0" name="os.vendor" value="EFI"/>
     <param pos="0" name="os.product" value="Fiery Print Server"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
   </fingerprint>
 
   <!-- Conjectured based on known MX FTP fingerprints -->
@@ -1289,11 +1289,11 @@ more text</example>
     <example os.version="V56.17.5Z">ZBR-79071 Version V56.17.5Z ready.</example>
     <example os.version="7.02">ZBR-46687 Version 7.02 ready.</example>
     <param pos="0" name="os.vendor" value="ZebraNet"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
     <param pos="0" name="hw.vendor" value="ZebraNet"/>
-    <param pos="0" name="hw.device" value="Print server"/>
+    <param pos="0" name="hw.device" value="Print Server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
 

data/xml/hp_pjl_id.xml

@@ -393,7 +393,7 @@
     <example>EX4112-4127</example>
     <param pos="0" name="os.vendor" value="Xerox"/>
     <param pos="0" name="os.family" value="EX"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
 

data/xml/html_title.xml

@@ -7,6 +7,11 @@
     <example>301 Moved Permanently</example>
   </fingerprint>
 
+  <fingerprint pattern="^302 Found$">
+    <description>302 Found - generic -- assert nothing.</description>
+    <example>302 Found</example>
+  </fingerprint>
+
   <fingerprint pattern="^400 Bad Request$">
     <description>400 Bad Request - generic -- assert nothing.</description>
     <example>400 Bad Request</example>
@@ -17,9 +22,38 @@
     <example>401 Unauthorized</example>
   </fingerprint>
 
-  <fingerprint pattern="^404 Not Found$">
+  <fingerprint pattern="^403 Forbidden$">
+    <description>403 Forbidden - generic -- assert nothing.</description>
+    <example>403 Forbidden</example>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:404 )?Not Found$">
     <description>404 Not Found - generic -- assert nothing.</description>
     <example>404 Not Found</example>
+    <example>Not Found</example>
+  </fingerprint>
+
+  <fingerprint pattern="^Invalid URL$">
+    <description>Invalid URL - generic -- assert nothing.</description>
+    <example>Invalid URL</example>
+  </fingerprint>
+
+  <fingerprint pattern="^ERROR: The request could not be satisfied$">
+    <description>Amazon CloudFront web load balancer endpoint</description>
+    <example>ERROR: The request could not be satisfied</example>
+    <param pos="0" name="service.vendor" value="Amazon"/>
+    <param pos="0" name="service.family" value="CloudFront"/>
+    <param pos="0" name="service.product" value="CloudFront Load Balancer"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:amazon:amazon_cloudfront:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Microsoft Azure Web App - Error 404$">
+    <description>Microsoft Azure Web App - Error 404</description>
+    <example>Microsoft Azure Web App - Error 404</example>
+    <param pos="0" name="service.vendor" value="Microsoft"/>
+    <param pos="0" name="service.family" value="Azure"/>
+    <param pos="0" name="service.product" value="Azure App Service on Azure Stack"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:azure_app_service_on_azure_stack:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Index of /">
@@ -103,9 +137,10 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^Apache Tomcat/(\S+)$">
+  <fingerprint pattern="^Apache Tomcat/(\S+)(?: - Error report)?$">
     <description>Apache tomcat with minimal version information</description>
     <example service.version="8.0.32">Apache Tomcat/8.0.32</example>
+    <example service.version="5.5.29">Apache Tomcat/5.5.29 - Error report</example>
     <param pos="0" name="service.vendor" value="Apache"/>
     <param pos="0" name="service.product" value="Tomcat"/>
     <param pos="0" name="service.family" value="Tomcat"/>
@@ -113,6 +148,32 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
   </fingerprint>
 
+  <fingerprint pattern="^Apache Tomcat/(\S+) \(Ubuntu\) - Error report$">
+    <description>Apache Tomcat - Error report on Ubuntu</description>
+    <example service.version="8.0.32">Apache Tomcat/8.0.32 (Ubuntu) - Error report</example>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.product" value="Tomcat"/>
+    <param pos="0" name="service.family" value="Tomcat"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Apache Tomcat/(\S+) \(Debian\) - Error report$">
+    <description>Apache Tomcat - Error report on Debian</description>
+    <example service.version="7.0.56">Apache Tomcat/7.0.56 (Debian) - Error report</example>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.product" value="Tomcat"/>
+    <param pos="0" name="service.family" value="Tomcat"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^AiCloud">
     <description>ASUS AiCloud</description>
     <example>AiCloud</example>
@@ -255,6 +316,7 @@
     <param pos="0" name="hw.vendor" value="Philips"/>
     <param pos="0" name="hw.product" value="Hue"/>
     <param pos="0" name="hw.device" value="Light Bulb"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:philips:hue:-"/>
   </fingerprint>
 
   <fingerprint pattern="LANDesk\(R\) Management Agent$">
@@ -301,6 +363,14 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:parallels:parallels_plesk_panel:-"/>
   </fingerprint>
 
+  <fingerprint pattern="^Sage X3$">
+    <description>Sage X3 Syracuse Web Server</description>
+    <example>Sage X3</example>
+    <param pos="0" name="service.vendor" value="Sage"/>
+    <param pos="0" name="service.family" value="Sage X3 Syracuse Web Server"/>
+    <param pos="0" name="service.product" value="Sage X3 Syracuse Web Server"/>
+  </fingerprint>
+
   <fingerprint pattern="^Web Viewer for Samsung DVR$">
     <description>Samsung DVRs</description>
     <example>Web Viewer for Samsung DVR</example>
@@ -314,6 +384,32 @@
     <param pos="0" name="os.vendor" value="SonicWall"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.family" value="SonicOS"/>
+    <param pos="0" name="os.product" value="SonicOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^SonicWall Universal Management Suite v(\d+\.\d+)$">
+    <description>SonicWall Universal Management Appliance - with version</description>
+    <example service.version="8.7">SonicWall Universal Management Suite v8.7</example>
+    <param pos="0" name="service.vendor" value="SonicWall"/>
+    <param pos="0" name="service.product" value="Universal Management Appliance"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:sonicwall:universal_management_appliance:{service.version}"/>
+    <param pos="0" name="os.vendor" value="SonicWall"/>
+    <param pos="0" name="os.family" value="SonicOS"/>
+    <param pos="0" name="os.product" value="SonicOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Fireware XTM User Authentication$">
+    <description>WatchGuard Fireware XTM login page</description>
+    <example>Fireware XTM User Authentication</example>
+    <param pos="0" name="service.vendor" value="WatchGuard"/>
+    <param pos="0" name="service.product" value="Fireware XTM"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:watchguard:fireware_xtm:-"/>
+    <param pos="0" name="os.vendor" value="WatchGuard"/>
+    <param pos="0" name="os.product" value="Fireware"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:watchguard:fireware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(.*).nbsp;-.nbsp;Synology.nbsp;DiskStation$">
@@ -334,6 +430,10 @@
     <description>Synology with WebStation web hosting</description>
     <example>Hello! Welcome to Synology Web Station!</example>
     <example>Hallo! Herzlich Willkommen bei Synology Web Station!</example>
+    <param pos="0" name="service.vendor" value="Synology"/>
+    <param pos="0" name="service.family" value="Diskstation"/>
+    <param pos="0" name="service.product" value="Web Station"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:synology:web_station:-"/>
     <param pos="0" name="hw.vendor" value="Synology"/>
     <param pos="0" name="hw.family" value="DiskStation"/>
     <param pos="0" name="hw.device" value="NAS"/>
@@ -378,8 +478,10 @@
     <param pos="0" name="os.vendor" value="Ubiquiti"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="EdgeOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:ui:edgeos:-"/>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
     <param pos="0" name="hw.product" value="EdgeSwitch"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:ui:edgeswitch:-"/>
   </fingerprint>
 
   <fingerprint pattern="^EdgeOS$">
@@ -388,6 +490,7 @@
     <param pos="0" name="os.vendor" value="Ubiquiti"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="EdgeOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:ui:edgeos:-"/>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
   </fingerprint>
 
@@ -425,6 +528,50 @@
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
 
+  <!-- Various products by Zyxel -->
+
+  <fingerprint pattern="^USG60$">
+    <description>Zyxel USG60 Unified Security Gateway</description>
+    <example>USG60</example>
+    <param pos="0" name="os.vendor" value="Zyxel"/>
+    <param pos="0" name="os.product" value="USG60 firmware"/>
+    <param pos="0" name="os.device" value="Firewall"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:zyxel:usg60_firmware:-"/>
+    <param pos="0" name="hw.vendor" value="Zyxel"/>
+    <param pos="0" name="hw.family" value="Unified Security Gateway"/>
+    <param pos="0" name="hw.product" value="USG60"/>
+    <param pos="0" name="hw.device" value="Firewall"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:zyxel:usg60:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^USG40$">
+    <description>Zyxel USG40 Unified Security Gateway</description>
+    <example>USG40</example>
+    <param pos="0" name="os.vendor" value="Zyxel"/>
+    <param pos="0" name="os.product" value="USG40 firmware"/>
+    <param pos="0" name="os.device" value="Firewall"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:zyxel:usg40_firmware:-"/>
+    <param pos="0" name="hw.vendor" value="Zyxel"/>
+    <param pos="0" name="hw.family" value="Unified Security Gateway"/>
+    <param pos="0" name="hw.product" value="USG40"/>
+    <param pos="0" name="hw.device" value="Firewall"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:zyxel:usg40:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^USG20-VPN$">
+    <description>Zyxel USG20-VPN Unified Security Gateway</description>
+    <example>USG20-VPN</example>
+    <param pos="0" name="os.vendor" value="Zyxel"/>
+    <param pos="0" name="os.product" value="USG20-VPN firmware"/>
+    <param pos="0" name="os.device" value="Firewall"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:zyxel:usg20-vpn_firmware:-"/>
+    <param pos="0" name="hw.vendor" value="Zyxel"/>
+    <param pos="0" name="hw.family" value="Unified Security Gateway"/>
+    <param pos="0" name="hw.product" value="USG20-VPN"/>
+    <param pos="0" name="hw.device" value="Firewall"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:zyxel:usg20-vpn:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^RomPager Embedded Web Server Toolkit$">
     <description>Embedded HTTP server used by many vendors and device
       types, including APC, 3Com, Andover Controls, Cisco VoIP, D-Link,
@@ -436,6 +583,18 @@
     <param pos="0" name="service.product" value="RomPager"/>
   </fingerprint>
 
+  <fingerprint pattern="^Wowza Streaming Engine 4 (Subscription|Perpetual Pro) Edition (\d\.[\w.]+) build(\d+)$">
+    <description>Wowza Streaming Engine</description>
+    <example service.version="4.7.7.01" service.version.version="20190222144406">Wowza Streaming Engine 4 Subscription Edition 4.7.7.01 build20190222144406</example>
+    <example service.edition="Perpetual Pro">Wowza Streaming Engine 4 Perpetual Pro Edition 4.8.8.01 build20201216140014</example>
+    <param pos="0" name="service.vendor" value="Wowza"/>
+    <param pos="0" name="service.product" value="Streaming Engine"/>
+    <param pos="1" name="service.edition"/>
+    <param pos="2" name="service.version"/>
+    <param pos="3" name="service.version.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:wowza:streaming_engine:{service.version}"/>
+  </fingerprint>
+
   <fingerprint pattern="^RouterOS router configuration page$">
     <description>MikroTik RouterOS router configuration page</description>
     <example>RouterOS router configuration page</example>
@@ -531,6 +690,10 @@
   <fingerprint pattern="^Netgear Prosafe Plus Switch$">
     <description>Netgear Prosafe Plus Switch</description>
     <example>Netgear Prosafe Plus Switch</example>
+    <param pos="0" name="os.vendor" value="Netgear"/>
+    <param pos="0" name="os.device" value="Switch"/>
+    <param pos="0" name="os.product" value="Prosafe Firmware"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:netgear:prosafe_firmware:-"/>
     <param pos="0" name="hw.vendor" value="Netgear"/>
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="0" name="hw.product" value="Prosafe Plus"/>
@@ -592,6 +755,14 @@
     <param pos="0" name="hw.product" value="Lantick Ethernet Relay Controller"/>
   </fingerprint>
 
+  <fingerprint pattern="^XYTRONIX Relay$">
+    <description>Xytronix Relay</description>
+    <example>XYTRONIX Relay</example>
+    <param pos="0" name="hw.vendor" value="Xytronix"/>
+    <param pos="0" name="hw.device" value="Relay Controller"/>
+    <param pos="0" name="hw.product" value="Ethernet Relay Controller"/>
+  </fingerprint>
+
   <fingerprint pattern="^(myUTN(?:-[a-zA-Z0-9]+)?) Control Center$">
     <description>myUTN Device Server</description>
     <example hw.product="myUTN-50a">myUTN-50a Control Center</example>
@@ -621,14 +792,14 @@
     <description>Eltek Power Controller</description>
     <example>WebPower</example>
     <param pos="0" name="hw.vendor" value="Eltek"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
   </fingerprint>
 
   <fingerprint pattern="(Expert Power Control NET \d+x\d+) - (.*)$">
     <description>Gude Expert Power Control</description>
     <example host.name="Rack42" hw.product="Expert Power Control NET 2x6">Expert Power Control NET 2x6 - Rack42</example>
     <param pos="0" name="hw.vendor" value="Gude"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="host.name"/>
   </fingerprint>
@@ -637,7 +808,7 @@
     <description>Sentry Switched CDU</description>
     <example>Sentry Switched CDU</example>
     <param pos="0" name="hw.vendor" value="ServerTech"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="0" name="hw.product" value="Sentry Switched CDU"/>
   </fingerprint>
 
@@ -645,7 +816,7 @@
     <description>Emerson Network Power Rack PDU Card</description>
     <example>Emerson Network Power Rack PDU Card</example>
     <param pos="0" name="hw.vendor" value="Emerson"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="0" name="hw.product" value="Rack PDU Card"/>
   </fingerprint>
 
@@ -656,7 +827,7 @@
     <example hw.vendor="Vertiv">Vertiv IntelliSlot Web Card</example>
     <example hw.vendor="Liebert">Liebert IntelliSlot Web Card</example>
     <param pos="1" name="hw.vendor"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="0" name="hw.product" value="IntelliSlot Web Card"/>
   </fingerprint>
 
@@ -664,7 +835,7 @@
     <description>ConnectUPS Web/SNMP Card</description>
     <example>ConnectUPS Web/SNMP Card</example>
     <param pos="0" name="hw.vendor" value="APC"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="0" name="hw.product" value="ConnectUPS Web Card"/>
   </fingerprint>
 
@@ -795,11 +966,12 @@
     <param pos="0" name="hw.device" value="Lights Out Management"/>
     <param pos="0" name="hw.vendor" value="HP"/>
     <param pos="0" name="hw.product" value="iLO"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights_out:-"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights-out:-"/>
     <param pos="0" name="os.vendor" value="HP"/>
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="0" name="os.family" value="iLO"/>
     <param pos="0" name="os.product" value="iLO"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_firmware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^HP Integrated Lights-Out 2$">
@@ -808,24 +980,38 @@
     <param pos="0" name="hw.device" value="Lights Out Management"/>
     <param pos="0" name="hw.vendor" value="HP"/>
     <param pos="0" name="hw.product" value="iLO"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights_out:-"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights-out:-"/>
     <param pos="0" name="os.vendor" value="HP"/>
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="0" name="os.family" value="iLO"/>
     <param pos="0" name="os.product" value="iLO 2"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_2_firmware:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^(iLO \d+)$">
-    <description>HP Integrated Lights-Out 3+</description>
-    <example hw.product="iLO 3" os.product="iLO 3">iLO 3</example>
-    <example hw.product="iLO 4" os.product="iLO 4">iLO 4</example>
+  <fingerprint pattern="^iLO 3$">
+    <description>HP Integrated Lights-Out 3</description>
+    <example>iLO 3</example>
     <param pos="0" name="hw.device" value="Lights Out Management"/>
     <param pos="0" name="hw.vendor" value="HP"/>
-    <param pos="1" name="hw.product"/>
+    <param pos="0" name="hw.product" value="iLO 3"/>
     <param pos="0" name="os.vendor" value="HP"/>
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="0" name="os.family" value="iLO"/>
-    <param pos="1" name="os.product"/>
+    <param pos="0" name="os.product" value="iLO 3"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_3_firmware:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^iLO 4$">
+    <description>HP Integrated Lights-Out 4</description>
+    <example>iLO 4</example>
+    <param pos="0" name="hw.device" value="Lights Out Management"/>
+    <param pos="0" name="hw.vendor" value="HP"/>
+    <param pos="0" name="hw.product" value="iLO 4"/>
+    <param pos="0" name="os.vendor" value="HP"/>
+    <param pos="0" name="os.device" value="Lights Out Management"/>
+    <param pos="0" name="os.family" value="iLO"/>
+    <param pos="0" name="os.product" value="iLO 4"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_4_firmware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^HPE SimpliVity OmniStack$">
@@ -981,6 +1167,14 @@
     <param pos="0" name="hw.device" value="VoIP"/>
   </fingerprint>
 
+  <fingerprint pattern="^3CX Phone System Management Console$">
+    <description>3CX Phone System Management Console</description>
+    <example>3CX Phone System Management Console</example>
+    <param pos="0" name="service.vendor" value="3CX"/>
+    <param pos="0" name="service.product" value="3CX Web Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:3cx:3cx_web_server:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^(SPA\S+) Configuration Utility$">
     <description>Cisco IP Phone - SPA504G Configuration Utility</description>
     <example hw.product="SPA504G">SPA504G Configuration Utility</example>
@@ -1001,7 +1195,7 @@
     <description>Cisco IP Camera</description>
     <example>Cisco IP Camera</example>
     <param pos="0" name="hw.vendor" value="Cisco"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="^Cisco TelePresence MCU">
@@ -1045,7 +1239,6 @@
     <param pos="0" name="os.device" value="Switch"/>
     <param pos="0" name="os.product" value="MDS 9000"/>
     <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:mds_9000:{os.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Stealthwatch Management Console$">
@@ -1099,7 +1292,7 @@
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.device" value="Wireless Controller"/>
     <param pos="0" name="os.product" value="Wireless LAN Controller"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:wireless_lan_controller:-"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:wireless_lan_controller_software:-"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.device" value="Wireless Controller"/>
     <param pos="0" name="hw.product" value="Wireless LAN Controller"/>
@@ -1158,19 +1351,19 @@
     <description>Axis Communications Web Cam</description>
     <example>AXIS</example>
     <param pos="0" name="hw.vendor" value="AXIS"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="os.vendor" value="AXIS"/>
     <param pos="0" name="os.family" value="Linux"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="^Hanwha Techwin$">
     <description>Hanwha Techwin IP Camera</description>
     <example>Hanwha Techwin</example>
     <param pos="0" name="hw.vendor" value="Hanwha Techwin"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="os.vendor" value="Hanwha Techwin"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
 
@@ -1179,10 +1372,10 @@
     <example hw.product="WV-NS202A">WV-NS202A Network Camera</example>
     <example hw.product="WV-NS954">WV-NS954 Network Camera</example>
     <param pos="0" name="hw.vendor" value="Panasonic"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Panasonic"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
 
@@ -1416,7 +1609,26 @@
     <param pos="0" name="service.vendor" value="Citrix"/>
     <param pos="0" name="service.product" value="XenServer"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.device" value="Hypervisor"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:citrix:xenserver:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Citrix"/>
+    <param pos="0" name="os.product" value="XenServer"/>
+    <param pos="0" name="os.device" value="Hypervisor"/>
+    <param pos="0" name="hw.device" value="Hypervisor"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Welcome to Citrix Hypervisor ([0-9\.]+)$">
+    <description>XenServer - Hypervisor variant</description>
+    <example service.version="8.2.0">Welcome to Citrix Hypervisor 8.2.0</example>
+    <param pos="0" name="service.vendor" value="Citrix"/>
+    <param pos="0" name="service.product" value="XenServer"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.device" value="Hypervisor"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:citrix:xenserver:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Citrix"/>
+    <param pos="0" name="os.product" value="XenServer"/>
+    <param pos="0" name="os.device" value="Hypervisor"/>
+    <param pos="0" name="hw.device" value="Hypervisor"/>
   </fingerprint>
 
   <fingerprint pattern="^RabbitMQ Management$">
@@ -1498,10 +1710,11 @@
   </fingerprint>
 
   <fingerprint pattern="^Login - OpenStack Dashboard$">
-    <description>OpenStack Dashboard</description>
+    <description>OpenStack Horizon Dashboard</description>
     <example>Login - OpenStack Dashboard</example>
     <param pos="0" name="service.vendor" value="OpenStack"/>
-    <param pos="0" name="service.product" value="Dashboard"/>
+    <param pos="0" name="service.product" value="Horizon"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:openstack:horizon:-"/>
   </fingerprint>
 
   <fingerprint pattern="^splunkd$">
@@ -1535,6 +1748,34 @@
     <param pos="0" name="service.product" value="Site Recovery Manager"/>
   </fingerprint>
 
+  <fingerprint pattern="^&quot; \+ ID_VC_Welcome \+ &quot;$">
+    <description>VMware vCenter</description>
+    <example>" + ID_VC_Welcome + "</example>
+    <param pos="0" name="service.vendor" value="VMware"/>
+    <param pos="0" name="service.product" value="vCenter"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:vmware:vcenter_server:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^&quot; \+ ID_EESX_Welcome \+ &quot;$">
+    <description>VMware ESXi</description>
+    <example>" + ID_EESX_Welcome + "</example>
+    <param pos="0" name="service.vendor" value="VMware"/>
+    <param pos="0" name="os.vendor" value="VMware"/>
+    <param pos="0" name="os.family" value="VMware ESX/ESXi"/>
+    <param pos="0" name="os.product" value="VMware ESXi Server"/>
+    <param pos="0" name="os.device" value="Hypervisor"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:vmware:esxi:-"/>
+    <param pos="0" name="hw.device" value="Hypervisor"/>
+  </fingerprint>
+
+  <fingerprint pattern="^&quot; \+ ID_Converter_Welcome \+ &quot;$">
+    <description>VMware Converter</description>
+    <example>" + ID_Converter_Welcome + "</example>
+    <param pos="0" name="service.vendor" value="VMware"/>
+    <param pos="0" name="service.product" value="vCenter Converter"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:vmware:vcenter_converter:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^Graylog Web Interface$">
     <description>Graylog Web Interface</description>
     <example>Graylog Web Interface</example>
@@ -1551,6 +1792,7 @@
     <example>Elastic Kibana</example>
     <param pos="0" name="service.vendor" value="Elastic"/>
     <param pos="0" name="service.product" value="Kibana"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:elastic:kibana:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Grafana$">
@@ -1589,7 +1831,15 @@
     <example>ManageEngine OpManager</example>
     <param pos="0" name="service.vendor" value="ManageEngine"/>
     <param pos="0" name="service.product" value="OpManager"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:manageengine:opmanager:-"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:zohocorp:manageengine_opmanager:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^ManageEngine Desktop Central 9$">
+    <description>ManageEngine Desktop Central 9</description>
+    <example>ManageEngine Desktop Central 9</example>
+    <param pos="0" name="service.vendor" value="ManageEngine"/>
+    <param pos="0" name="service.product" value="Desktop Central"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:manageengine:desktop_central:-"/>
   </fingerprint>
 
   <fingerprint pattern="^ManageEngine ADAudit Plus$">
@@ -1597,6 +1847,7 @@
     <example>ManageEngine ADAudit Plus</example>
     <param pos="0" name="service.vendor" value="ManageEngine"/>
     <param pos="0" name="service.product" value="ADAudit Plus"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:zohocorp:manageengine_adaudit_plus:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(ScanFront \d.+)Web Menu$">
@@ -1622,9 +1873,9 @@
   <fingerprint pattern="^Liebert OpenComms Network Interface Card$">
     <description>Liebert UPS</description>
     <example>Liebert OpenComms Network Interface Card</example>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="0" name="hw.vendor" value="Liebert"/>
-    <param pos="0" name="os.device" value="Power device"/>
+    <param pos="0" name="os.device" value="Power Device"/>
     <param pos="0" name="os.vendor" value="Liebert"/>
   </fingerprint>
 
@@ -1655,11 +1906,17 @@
     <param pos="0" name="os.family" value="NetScaler"/>
     <param pos="0" name="os.device" value="Network Management Device"/>
     <param pos="0" name="os.product" value="NetScaler"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_firmware:-"/>
     <param pos="0" name="service.vendor" value="Citrix"/>
     <param pos="0" name="service.family" value="NetScaler"/>
     <param pos="0" name="service.device" value="Network Management Device"/>
     <param pos="0" name="service.product" value="NetScaler"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler:-"/>
+    <param pos="0" name="hw.vendor" value="Citrix"/>
+    <param pos="0" name="hw.family" value="NetScaler"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.product" value="NetScaler Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:citrix:netscaler_gateway:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Netscaler Gateway$">
@@ -1669,10 +1926,17 @@
     <param pos="0" name="os.family" value="NetScaler"/>
     <param pos="0" name="os.device" value="Network Management Device"/>
     <param pos="0" name="os.product" value="NetScaler Gateway"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_gateway_firmware:-"/>
     <param pos="0" name="service.vendor" value="Citrix"/>
     <param pos="0" name="service.family" value="NetScaler"/>
     <param pos="0" name="service.device" value="Network Management Device"/>
     <param pos="0" name="service.product" value="NetScaler Gateway"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler_gateway:-"/>
+    <param pos="0" name="hw.vendor" value="Citrix"/>
+    <param pos="0" name="hw.family" value="NetScaler"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.product" value="NetScaler Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:citrix:netscaler_gateway:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Citrix (?:NetScaler SDX|ADC SDX)$">
@@ -1687,6 +1951,11 @@
     <param pos="0" name="service.family" value="NetScaler"/>
     <param pos="0" name="service.device" value="Network Management Device"/>
     <param pos="0" name="service.product" value="NetScaler SDX Gateway"/>
+    <param pos="0" name="hw.vendor" value="Citrix"/>
+    <param pos="0" name="hw.family" value="NetScaler"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.product" value="NetScaler SDX Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:citrix:netscaler_sdx:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Citrix NetScaler Insight Center$">
@@ -1800,22 +2069,22 @@
 
   <fingerprint pattern="^AVTECH Software, Inc\. - Room Alert(?:&amp;reg;)?\s+([a-zA-Z0-9/]+) - Advanced">
     <description>AVTECH RoomAlert</description>
-    <example hw.product="Room Alert 11E" hw.product.model="11E">AVTECH Software, Inc. - Room Alert 11E - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
-    <example hw.product="Room Alert 32E/W" hw.product.model="32E/W">AVTECH Software, Inc. - Room Alert 32E/W - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
-    <example hw.product="Room Alert 32E/W" hw.product.model="32E/W">AVTECH Software, Inc. - Room Alert&amp;reg; 32E/W - Advanced Computer Room Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
+    <example hw.product="Room Alert 11E" hw.model="11E">AVTECH Software, Inc. - Room Alert 11E - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
+    <example hw.product="Room Alert 32E/W" hw.model="32E/W">AVTECH Software, Inc. - Room Alert 32E/W - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
+    <example hw.product="Room Alert 32E/W" hw.model="32E/W">AVTECH Software, Inc. - Room Alert&amp;reg; 32E/W - Advanced Computer Room Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
     <param pos="0" name="hw.vendor" value="AVTECH"/>
     <param pos="0" name="hw.device" value="Monitoring"/>
-    <param pos="1" name="hw.product.model"/>
-    <param pos="0" name="hw.product" value="Room Alert {hw.product.model}"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.product" value="Room Alert {hw.model}"/>
   </fingerprint>
 
   <fingerprint pattern="^AVTECH Software, Inc\. - TemPageR\s+([a-zA-Z0-9/]+) - Real-Time">
     <description>AVTECH TepPageR</description>
-    <example hw.product="TemPageR 3E" hw.product.model="3E">AVTECH Software, Inc. - TemPageR 3E - Real-Time Temperature Monitor For IT &amp;amp; Facilities Environment Monitoring</example>
+    <example hw.product="TemPageR 3E" hw.model="3E">AVTECH Software, Inc. - TemPageR 3E - Real-Time Temperature Monitor For IT &amp;amp; Facilities Environment Monitoring</example>
     <param pos="0" name="hw.vendor" value="AVTECH"/>
     <param pos="0" name="hw.device" value="Monitoring"/>
-    <param pos="1" name="hw.product.model"/>
-    <param pos="0" name="hw.product" value="TemPageR {hw.product.model}"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.product" value="TemPageR {hw.model}"/>
   </fingerprint>
 
   <fingerprint pattern="^AppDynamics$">
@@ -2000,7 +2269,7 @@
     <description>Mobotix Network Camera</description>
     <example>Redirect to userimage: /control/userimage.html</example>
     <param pos="0" name="hw.vendor" value="Mobotix"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="hw.product" value="IP Camera"/>
   </fingerprint>
 
@@ -2059,6 +2328,7 @@
     <param pos="0" name="os.vendor" value="Data Domain"/>
     <param pos="0" name="os.product" value="DD OS"/>
     <param pos="0" name="os.device" value="Storage"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:dell:emc_data_domain_os:-"/>
     <param pos="0" name="hw.vendor" value="Data Domain"/>
     <param pos="0" name="hw.product" value="DD OS"/>
     <param pos="0" name="hw.device" value="Storage"/>
@@ -2176,6 +2446,14 @@
     <param pos="0" name="service.product" value="Kiwi Syslog"/>
   </fingerprint>
 
+  <fingerprint pattern="^SolarWinds Orion$">
+    <description>SolarWinds Orion</description>
+    <example>SolarWinds Orion</example>
+    <param pos="0" name="service.vendor" value="SolarWinds"/>
+    <param pos="0" name="service.product" value="Orion Platform"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:orion_platform:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^ClickShare Configurator$">
     <description>ClickShare Wireless Presenter</description>
     <example>ClickShare Configurator</example>
@@ -2192,10 +2470,51 @@
     <example hw.product="IQA22N">IQA22N IQEYE1A1613: Live Images</example>
     <example hw.product="IQeye703">IQeye703 IQEYE011750: Live Images</example>
     <param pos="0" name="hw.vendor" value="IQinVision"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
+  <fingerprint pattern="^Welcome to Oracle Fusion Middleware$">
+    <description>Oracle Fusion Middleware</description>
+    <example>Welcome to Oracle Fusion Middleware</example>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.product" value="Fusion Middleware"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:fusion_middleware:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Oracle Secure Global Desktop(?: Redirect Page)?$">
+    <description>Oracle Secure Global Desktop</description>
+    <example>Oracle Secure Global Desktop</example>
+    <example>Oracle Secure Global Desktop Redirect Page</example>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.product" value="Secure Global Desktop"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:secure_global_desktop:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^OTM - Oracle Transportation Management$">
+    <description>Oracle Transportation Management</description>
+    <example>OTM - Oracle Transportation Management</example>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.product" value="Transportation Management"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:transportation_management:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Bad Oracle Access Manager Request$">
+    <description>Oracle Access Manager - Bad Request</description>
+    <example>Bad Oracle Access Manager Request</example>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.product" value="Access Manager"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:access_manager:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Oracle Access Manager Operation Error$">
+    <description>Oracle Access Manager - Operation Error</description>
+    <example>Oracle Access Manager Operation Error</example>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.product" value="Access Manager"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:access_manager:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^(?:Oracle\(R\) )?Integrated Lights Out Manager$">
     <description>Oracle iLOM</description>
     <example>Oracle(R) Integrated Lights Out Manager</example>
@@ -2208,13 +2527,14 @@
     <param pos="0" name="os.vendor" value="Oracle"/>
     <param pos="0" name="os.family" value="ILOM"/>
     <param pos="0" name="os.product" value="ILOM"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:oracle:integrated_lights_out_manager_firmware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Genetec - SHARPV\S+$">
     <description>Genetec AutoVu SharpV ALPR Camera</description>
     <example>Genetec - SHARPV01111</example>
     <param pos="0" name="hw.vendor" value="Genetec"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="hw.product" value="AutoVu SharpV"/>
   </fingerprint>
 
@@ -2241,6 +2561,7 @@
     <example>TwonkyMedia server media browser</example>
     <param pos="0" name="service.vendor" value="Lynx Technology"/>
     <param pos="0" name="service.product" value="Twonky Media Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:lynxtechnology:twonky_server:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Spiceworks(?: Server Busy| Help Desk)?$">
@@ -2274,6 +2595,7 @@
     <example>SABnzbd - Log in</example>
     <param pos="0" name="service.vendor" value="SABnzbd"/>
     <param pos="0" name="service.product" value="SABnzbd"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:sabnzbd:sabnzbd:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Zabbix|.*: Zabbix)$">
@@ -2309,10 +2631,11 @@
   </fingerprint>
 
   <fingerprint pattern="^Gerrit Code Review$">
-    <description>Gerrit Code Review</description>
+    <description>Google's Gerrit Code Review</description>
     <example>Gerrit Code Review</example>
-    <param pos="0" name="service.vendor" value="Gerrit"/>
-    <param pos="0" name="service.product" value="Code Review"/>
+    <param pos="0" name="service.vendor" value="Google"/>
+    <param pos="0" name="service.product" value="Gerrit"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:google:gerrit:-"/>
   </fingerprint>
 
   <fingerprint pattern=" - Ignition Gateway$">
@@ -2344,6 +2667,9 @@
     <description>OpenMediaVault</description>
     <example host.name="raspberrypi">openmediavault control panel - raspberrypi</example>
     <example host.name="raspberrypi">OpenMediaVault web administration interface - raspberrypi</example>
+    <param pos="0" name="service.vendor" value="OpenMediaVault"/>
+    <param pos="0" name="service.product" value="OpenMediaVault"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:openmediavault:openmediavault:-"/>
     <param pos="0" name="os.vendor" value="OpenMediaVault"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="OpenMediaVault"/>
@@ -2390,6 +2716,7 @@
     <param pos="0" name="service.vendor" value="CrushFTP"/>
     <param pos="0" name="service.product" value="CrushFTP Web Interface"/>
     <param pos="0" name="service.certainty" value="0.5"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:crushftp:crushftp:-"/>
   </fingerprint>
 
   <fingerprint pattern="^OpenEdge Explorer$">
@@ -2397,6 +2724,7 @@
     <example>OpenEdge Explorer</example>
     <param pos="0" name="service.vendor" value="Progress"/>
     <param pos="0" name="service.product" value="OpenEdge Explorer"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:progress:openedge:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Consul by HashiCorp$">
@@ -2442,7 +2770,8 @@
     <example>Swagger UI</example>
     <example>Swagger Editor</example>
     <param pos="0" name="service.vendor" value="Swagger"/>
-    <param pos="0" name="service.product" value="UI"/>
+    <param pos="0" name="service.product" value="Swagger UI"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:smartbear:swagger_ui:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Emby$">
@@ -2498,6 +2827,7 @@
     <example>SolarWinds Virtualization Manager</example>
     <param pos="0" name="service.vendor" value="SolarWinds"/>
     <param pos="0" name="service.product" value="Virtualization Manager"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:virtualization_manager:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Gitea: .*|LocalRepo|TurnKey Gitea)$">
@@ -2515,7 +2845,9 @@
     <description>Metasploit Pro (and Community Edition Web UI)</description>
     <example>Metasploit</example>
     <param pos="0" name="service.vendor" value="Rapid7"/>
-    <param pos="0" name="service.product" value="Metasploit Pro"/>
+    <param pos="0" name="service.product" value="Metasploit"/>
+    <param pos="0" name="service.edition" value="Pro"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:rapid7:metasploit:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Makito X Decoder$">
@@ -2553,12 +2885,14 @@
     <param pos="0" name="service.certainty" value="0.5"/>
   </fingerprint>
 
-  <fingerprint pattern="^ownCloud$">
+  <fingerprint pattern="^[oO]wn[cC]loud$">
     <description>ownCloud</description>
     <example>ownCloud</example>
+    <example>Owncloud</example>
     <param pos="0" name="service.vendor" value="ownCloud"/>
     <param pos="0" name="service.product" value="ownCloud Server"/>
     <param pos="0" name="service.certainty" value="0.5"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:owncloud:owncloud:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Octopus Deploy$">
@@ -2581,6 +2915,7 @@
     <example>RStudio Sign In</example>
     <param pos="0" name="service.vendor" value="RStudio"/>
     <param pos="0" name="service.product" value="Connect"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:rstudio:connect:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:TurnKey Moodle|New Site)$">
@@ -2588,8 +2923,9 @@
     <example>TurnKey Moodle</example>
     <example>New Site</example>
     <param pos="0" name="service.vendor" value="Moodle"/>
-    <param pos="0" name="service.product" value="Moodle CMS"/>
+    <param pos="0" name="service.product" value="Moodle"/>
     <param pos="0" name="service.certainty" value="0.5"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:moodle:moodle:-"/>
   </fingerprint>
 
   <fingerprint pattern="^ArchiveTeam Warrior$">
@@ -2637,11 +2973,13 @@
     <param pos="0" name="service.product" value="Security Scanner"/>
   </fingerprint>
 
-  <fingerprint pattern="^Kodi$">
+  <fingerprint pattern="^(?:Chorus 2 - )?Kodi(?: web interface)?$">
     <description>Kodi Media Server</description>
     <example>Kodi</example>
+    <example>Chorus 2 - Kodi web interface</example>
     <param pos="0" name="service.vendor" value="Kodi"/>
     <param pos="0" name="service.product" value="Media Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:kodi:kodi:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Drupal|TurnKey Drupal\d+|Select an installation profile)$">
@@ -2652,6 +2990,7 @@
     <example>Select an installation profile</example>
     <param pos="0" name="service.vendor" value="Drupal"/>
     <param pos="0" name="service.product" value="CMS"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:drupal:drupal:-"/>
   </fingerprint>
 
   <fingerprint pattern="^LibreNMS$">
@@ -2701,16 +3040,187 @@
     <param pos="0" name="hw.certainty" value="0.75"/>
     <param pos="0" name="os.vendor" value="Dell"/>
     <param pos="0" name="os.product" value="iDRAC Linux"/>
-    <param pos="0" name="os .certainty" value="0.75"/>
+    <param pos="0" name="os.certainty" value="0.75"/>
   </fingerprint>
 
   <fingerprint pattern="^Pulse Connect Secure - SSL">
     <description>Pulse Secure VPN</description>
     <example>Pulse Connect Secure - SSL</example>
+    <param pos="0" name="service.vendor" value="Pulse Secure"/>
+    <param pos="0" name="service.product" value="Pulse Connect Secure"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:pulsesecure:pulse_connect_secure:-"/>
     <param pos="0" name="os.vendor" value="Pulse Secure"/>
     <param pos="0" name="os.family" value="SSL-VPN"/>
     <param pos="0" name="os.device" value="SSL-VPN"/>
-    <param pos="0" name="os.product" value="SSL-VPN"/>
+    <param pos="0" name="os.product" value="Pulse Connect Secure"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Jellyfin$">
+    <description>Jellyfin media server</description>
+    <example>Jellyfin</example>
+    <param pos="0" name="service.vendor" value="Jellyfin"/>
+    <param pos="0" name="service.product" value="Media Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^proxmox - Proxmox Virtual Environment$">
+    <description>Proxmox open-source virtualization platform</description>
+    <example>proxmox - Proxmox Virtual Environment</example>
+    <param pos="0" name="service.vendor" value="Proxmox"/>
+    <param pos="0" name="service.product" value="Virtual Environment"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:proxmox:virtual_environment:-"/>
+    <param pos="0" name="os.vendor" value="Proxmox"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Proxmox"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Sony Network Camera$">
+    <description>Sony Network Camera</description>
+    <example>Sony Network Camera</example>
+    <param pos="0" name="hw.vendor" value="Sony"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
+    <param pos="0" name="hw.product" value="Network Camera"/>
+  </fingerprint>
+
+  <fingerprint pattern="Lifesize&amp;reg;$">
+    <description>Lifesize TelePresence</description>
+    <example>Lifesize&amp;reg;</example>
+    <example>400 - Bad Request	Lifesize&amp;reg;</example>
+    <param pos="0" name="hw.vendor" value="Lifesize"/>
+    <param pos="0" name="hw.device" value="Video Conferencing"/>
+    <param pos="0" name="hw.product" value="TelePresence"/>
+    <param pos="0" name="os.vendor" value="Lifesize"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="TelePresence"/>
+    <param pos="0" name="os.device" value="Video Conferencing"/>
+  </fingerprint>
+
+  <fingerprint pattern="^AT&amp;amp;T VPN Gateway$">
+    <description>ATT VPN Gateway</description>
+    <example>AT&amp;amp;T VPN Gateway</example>
+    <param pos="0" name="hw.vendor" value="ATT"/>
+    <param pos="0" name="hw.device" value="VPN"/>
+    <param pos="0" name="hw.product" value="VPN Gateway"/>
+  </fingerprint>
+
+  <fingerprint pattern="^AT&amp;amp;T U\d+: '([^']+)'$">
+    <description>ATT VPN Gateway w Hostname</description>
+    <example host.name="Austin-Boston">AT&amp;amp;T U115: 'Austin-Boston'</example>
+    <param pos="0" name="hw.vendor" value="ATT"/>
+    <param pos="0" name="hw.device" value="VPN"/>
+    <param pos="0" name="hw.product" value="VPN Gateway"/>
+    <param pos="1" name="host.name"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Symantec Encryption Verified Directory|Symantec Encryption Server.*)$">
+    <description>Symantec PGP Key Management Server</description>
+    <example>Symantec Encryption Verified Directory</example>
+    <example>Symantec Encryption Server - Page Not Found</example>
+    <example>Symantec Encryption Server - Login</example>
+    <param pos="0" name="hw.vendor" value="Symantec"/>
+    <param pos="0" name="hw.device" value="Security Appliance"/>
+    <param pos="0" name="hw.product" value="Key Management Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Riverbed Technology, Inc\.$">
+    <description>Riverbed Steelhead Appliance</description>
+    <example>Riverbed Technology, Inc.</example>
+    <param pos="0" name="hw.vendor" value="Riverbed"/>
+    <param pos="0" name="hw.device" value="Security Appliance"/>
+    <param pos="0" name="hw.product" value="Steelhead"/>
+    <param pos="0" name="os.product" value="RiOS"/>
+    <param pos="0" name="os.vendor" value="Riverbed"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:riverbed:rios:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^ClearPass - Aruba Networks$">
+    <description>ClearPass Policy Manager Appliance</description>
+    <example>ClearPass - Aruba Networks</example>
+    <param pos="0" name="hw.vendor" value="Aruba Networks"/>
+    <param pos="0" name="hw.device" value="Network Appliance"/>
+    <param pos="0" name="hw.product" value="ClearPass Policy Manager"/>
+    <param pos="0" name="service.vendor" value="Aruba Networks"/>
+    <param pos="0" name="service.device" value="Network Appliance"/>
+    <param pos="0" name="service.product" value="ClearPass Policy Manager"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:arubanetworks:clearpass_policy_manager:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^MSTR Collab Server$">
+    <description>MicroStrategy Collaboration Server</description>
+    <example>MSTR Collab Server</example>
+    <param pos="0" name="service.vendor" value="MicroStrategy"/>
+    <param pos="0" name="service.product" value="Collaboration Server"/>
+    <param pos="0" name="service.certainty" value="0.5"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Openfire Admin Console$">
+    <description>Openfire Admin Console</description>
+    <example>Openfire Admin Console</example>
+    <param pos="0" name="service.vendor" value="Ignite Realtime"/>
+    <param pos="0" name="service.product" value="OpenFire"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:igniterealtime:openfire:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^:: PBX in a Flash">
+    <description>PBX in a Flash</description>
+    <example>:: PBX in a Flash, Welcome!</example>
+    <param pos="0" name="hw.vendor" value="PIAF"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.product" value="PIAF Virtual Appliance"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Hak5 Cloud C">
+    <description>Hak5 Cloud c2</description>
+    <example>Hak5 Cloud C²</example>
+    <param pos="0" name="service.vendor" value="Hak5"/>
+    <param pos="0" name="service.product" value="Cloud C2"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Metabase$">
+    <description>Metabase</description>
+    <example>Metabase</example>
+    <param pos="0" name="service.vendor" value="Metabase"/>
+    <param pos="0" name="service.product" value="Metabase"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:metabase:metabase:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="Nextcloud">
+    <description>Nextcloud</description>
+    <example>Nextcloud</example>
+    <param pos="0" name="service.vendor" value="Nextcloud"/>
+    <param pos="0" name="service.product" value="Nextcloud Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:nextcloud:nextcloud_server:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Observium">
+    <description>Observium</description>
+    <example>Observium :  - Test infra</example>
+    <param pos="0" name="service.vendor" value="Observium"/>
+    <param pos="0" name="service.product" value="Observium"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:observium:observium:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Login to Webmin$">
+    <description>Webmin</description>
+    <example>Login to Webmin</example>
+    <param pos="0" name="service.vendor" value="Webmin"/>
+    <param pos="0" name="service.product" value="Webmin"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:webmin:webmin:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Login to Usermin$">
+    <description>Usermin</description>
+    <example>Login to Usermin</example>
+    <param pos="0" name="service.vendor" value="Webmin"/>
+    <param pos="0" name="service.product" value="Usermin"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:webmin:usermin:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^MoinMoinWiki">
+    <description>Moinmoin wiki</description>
+    <example>MoinMoinWiki - MoinMoin</example>
+    <param pos="0" name="service.vendor" value="MoinMoin"/>
+    <param pos="0" name="service.product" value="MoinMoin"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:moinmo:moinmoin:-"/>
   </fingerprint>
 
 </fingerprints>