diff --git a/tools/btstack_parser.py b/tools/btstack_parser.py
index ed908903e..2c0f0d5cc 100755
--- a/tools/btstack_parser.py
+++ b/tools/btstack_parser.py
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 # BlueKitchen GmbH (c) 2014
 
@@ -50,6 +51,8 @@ def parse_defines():
 def my_parse_events(path):
     events = []
     le_events = []
+    hfp_events = []
+    hsp_events = []
     params = []
     event_types = set()
     format = None
@@ -68,6 +71,10 @@ def my_parse_events(path):
                 if format != None:
                     if key.lower().startswith('hci_subevent_'):
                         le_events.append((value, key.lower().replace('hci_subevent_', 'hci_event_'), format, params))
+                    elif key.lower().startswith('hsp_subevent_'):
+                        hsp_events.append((value, key.lower().replace('hsp_subevent_', 'hsp_event_'), format, params))
+                    elif key.lower().startswith('hfp_subevent_'):
+                        hfp.append((value, key.lower().replace('hfp_subevent_', 'hfp_event_'), format, params))
                     else:
                         events.append((value, key, format, params))
                     event_types.add(key)