diff --git a/identifiers/service_product.txt b/identifiers/service_product.txt
index 0f3e68df..989b4324 100644
--- a/identifiers/service_product.txt
+++ b/identifiers/service_product.txt
@@ -855,3 +855,4 @@ Dicom Server
 Mantrey PACS
 Lidarr
 Miniflux
+OPNSense
diff --git a/identifiers/vendor.txt b/identifiers/vendor.txt
index 4cb72c7a..5883bc7a 100644
--- a/identifiers/vendor.txt
+++ b/identifiers/vendor.txt
@@ -911,3 +911,4 @@ Orthanc
 Mantrey
 Lidarr
 Miniflux
+OPNSense
diff --git a/xml/favicons.xml b/xml/favicons.xml
index db72e6b7..bc5afad2 100644
--- a/xml/favicons.xml
+++ b/xml/favicons.xml
@@ -1216,13 +1216,20 @@
   <fingerprint pattern="^e4fd990b4b8a5d61bd5ddb98cdfc7190$">
     <description>OPNsense Firewall</description>
     <example>e4fd990b4b8a5d61bd5ddb98cdfc7190</example>
+    <param pos="0" name="service.vendor" value="OPNSense"/>
+    <param pos="0" name="service.product" value="OPNSense"/>
+    <param pos="0" name="service.device" value="Firewall"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:opnsense:opnsense:-"/>
+    <param pos="0" name="service.component.vendor" value="lighttpd"/>
+    <param pos="0" name="service.component.product" value="lighttpd"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:lighttpd:lighttpd:-"/>
+    <param pos="0" name="os.vendor" value="FreeBSD"/>
+    <param pos="0" name="os.product" value="FreeBSD"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:freebsd:freebsd:-"/>
     <param pos="0" name="hw.vendor" value="OPNsense"/>
     <param pos="0" name="hw.device" value="Firewall"/>
     <param pos="0" name="hw.product" value="Firewall"/>
     <param pos="0" name="hw.certainty" value="0.5"/>
-    <param pos="0" name="os.vendor" value="OPNsense"/>
-    <param pos="0" name="os.product" value="FreeBSD"/>
-    <param pos="0" name="os.certainty" value="0.5"/>
   </fingerprint>
 
   <fingerprint pattern="^979d9a884c322862e6830f61e2c378e6$">
diff --git a/xml/html_title.xml b/xml/html_title.xml
index 92af0388..ea660529 100644
--- a/xml/html_title.xml
+++ b/xml/html_title.xml
@@ -3952,6 +3952,21 @@
     <param pos="0" name="os.product" value="FreeBSD"/>
   </fingerprint>
 
+  <fingerprint pattern="^Login \| OPNsense$">
+    <description>OPNSense Firewall</description>
+    <example>Login | OPNsense</example>
+    <param pos="0" name="service.vendor" value="OPNSense"/>
+    <param pos="0" name="service.product" value="OPNSense"/>
+    <param pos="0" name="service.device" value="Firewall"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:opnsense:opnsense:-"/>
+    <param pos="0" name="service.component.vendor" value="lighttpd"/>
+    <param pos="0" name="service.component.product" value="lighttpd"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:lighttpd:lighttpd:-"/>
+    <param pos="0" name="os.vendor" value="FreeBSD"/>
+    <param pos="0" name="os.product" value="FreeBSD"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:freebsd:freebsd:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^Vigor Login Page$">
     <description>DrayTek Vigor network equipment - without model or version</description>
     <example>Vigor Login Page</example>
diff --git a/xml/http_servers.xml b/xml/http_servers.xml
index 9b918646..5d081082 100644
--- a/xml/http_servers.xml
+++ b/xml/http_servers.xml
@@ -4398,11 +4398,16 @@
   <fingerprint pattern="^OPNsense$">
     <description>OPNsense Firewall</description>
     <example>OPNsense</example>
-    <param pos="0" name="hw.vendor" value="OPNsense"/>
-    <param pos="0" name="hw.device" value="Firewall"/>
-    <param pos="0" name="hw.product" value="Firewall"/>
-    <param pos="0" name="os.vendor" value="OPNsense"/>
+    <param pos="0" name="service.vendor" value="OPNSense"/>
+    <param pos="0" name="service.product" value="OPNSense"/>
+    <param pos="0" name="service.device" value="Firewall"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:opnsense:opnsense:-"/>
+    <param pos="0" name="service.component.vendor" value="lighttpd"/>
+    <param pos="0" name="service.component.product" value="lighttpd"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:lighttpd:lighttpd:-"/>
+    <param pos="0" name="os.vendor" value="FreeBSD"/>
     <param pos="0" name="os.product" value="FreeBSD"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:freebsd:freebsd:-"/>
   </fingerprint>
 
   <fingerprint pattern="^ELAN Controller$">
diff --git a/xml/x509_subjects.xml b/xml/x509_subjects.xml
index 815df0b0..4016e1f4 100644
--- a/xml/x509_subjects.xml
+++ b/xml/x509_subjects.xml
@@ -1091,9 +1091,10 @@
     <param pos="0" name="os.product" value="FreeBSD"/>
   </fingerprint>
 
-  <fingerprint pattern="^O=OPNsense,L=Middelharnis,ST=Zuid-Holland,C=NL$">
+  <fingerprint pattern="^O=OPNsense(?:[.]localdomain)?,L=Middelharnis,ST=Zuid-Holland,C=NL$">
     <description>OPNsense Firewall</description>
     <example>O=OPNsense,L=Middelharnis,ST=Zuid-Holland,C=NL</example>
+    <example>O=OPNsense.localdomain,L=Middelharnis,ST=Zuid-Holland,C=NL</example>
     <param pos="0" name="hw.vendor" value="OPNsense"/>
     <param pos="0" name="hw.device" value="Firewall"/>
     <param pos="0" name="hw.product" value="Firewall"/>