diff --git a/identifiers/service_product.txt b/identifiers/service_product.txt
index ffa874d7..555c510e 100644
--- a/identifiers/service_product.txt
+++ b/identifiers/service_product.txt
@@ -534,6 +534,7 @@ WebGUI
 WebLogic
 WebServer
 WebShield
+WebSocket++
 WebSphere
 WebSphere Load Balancer
 WebTrends
diff --git a/identifiers/vendor.txt b/identifiers/vendor.txt
index dd718161..d45514f4 100644
--- a/identifiers/vendor.txt
+++ b/identifiers/vendor.txt
@@ -814,6 +814,7 @@ Youngzsoft
 ZMailer
 ZTE
 Zabbix
+Zaphoyd Studios
 ZebraNet
 Zed Shaw
 Zyxel
diff --git a/xml/http_servers.xml b/xml/http_servers.xml
index 8b47d830..0ee5f997 100644
--- a/xml/http_servers.xml
+++ b/xml/http_servers.xml
@@ -1516,6 +1516,19 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:teamspeak:teamspeak:{service.version}"/>
   </fingerprint>
 
+  <fingerprint pattern="^WebSocket\+\+/([\d.-]+(?:-dev)?)$">
+    <description>WebSocket++ web server - https://github.com/zaphoyd/websocketpp</description>
+    <example service.version="0.8.1">WebSocket++/0.8.1</example>
+    <example service.version="0.8.2">WebSocket++/0.8.2</example>
+    <example service.version="0.4.0">WebSocket++/0.4.0</example>
+    <example service.version="0.8.0-dev">WebSocket++/0.8.0-dev</example>
+    <example service.version="2011-09-25">WebSocket++/2011-09-25</example>
+    <param pos="0" name="service.vendor" value="Zaphoyd Studios"/>
+    <param pos="0" name="service.product" value="WebSocket++"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:zaphoyd:websocketpp:{service.version}"/>
+  </fingerprint>
+
   <fingerprint pattern="^Lotus(?:-Domino)?(?:/|/0|/Release)?$">
     <description>IBM Lotus Notes/Domino with no useful version info</description>
     <example>Lotus</example>