diff --git a/identifiers/service_product.txt b/identifiers/service_product.txt
index d3918330..76a2bc07 100644
--- a/identifiers/service_product.txt
+++ b/identifiers/service_product.txt
@@ -50,6 +50,7 @@ BlackJumboDog
 BladeSystems
 Boa
 Bugzilla
+CALDERA
 CCProxy
 CMS
 CMS400.NET
diff --git a/identifiers/vendor.txt b/identifiers/vendor.txt
index 0793063c..6fec94f4 100644
--- a/identifiers/vendor.txt
+++ b/identifiers/vendor.txt
@@ -410,6 +410,7 @@ Lucent
 Lynx Technology
 Lyris
 MBP Kommunikationssysteme GmbH
+MITRE
 MPI Technologies
 MPS Software
 MRV Communications
diff --git a/xml/favicons.xml b/xml/favicons.xml
index 973bd54f..7eb4c10a 100644
--- a/xml/favicons.xml
+++ b/xml/favicons.xml
@@ -1954,4 +1954,12 @@
     <param pos="0" name="service.product" value="Covenant"/>
   </fingerprint>
 
+  <fingerprint pattern="^5508e5abca6493613e11c72f4296ebf4$">
+    <description>MITRE CALDERA C2 framework</description>
+    <example>5508e5abca6493613e11c72f4296ebf4</example>
+    <param pos="0" name="service.vendor" value="MITRE"/>
+    <param pos="0" name="service.product" value="CALDERA"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:mitre:caldera:-"/>
+  </fingerprint>
+
 </fingerprints>
\ No newline at end of file
diff --git a/xml/html_title.xml b/xml/html_title.xml
index 66d31f0e..0f1432cb 100644
--- a/xml/html_title.xml
+++ b/xml/html_title.xml
@@ -3730,4 +3730,12 @@
     <param pos="0" name="service.product" value="Covenant"/>
   </fingerprint>
 
+  <fingerprint pattern="^Login | CALDERA$">
+    <description>MITRE CALDERA C2 framework</description>
+    <example>Login | CALDERA</example>
+    <param pos="0" name="service.vendor" value="MITRE"/>
+    <param pos="0" name="service.product" value="CALDERA"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:mitre:caldera:-"/>
+  </fingerprint>
+
 </fingerprints>
\ No newline at end of file