diff --git a/src/btstack_defines.h b/src/btstack_defines.h
index e54e4f7f3..7f388938f 100644
--- a/src/btstack_defines.h
+++ b/src/btstack_defines.h
@@ -1415,6 +1415,23 @@ typedef uint8_t sm_key_t[16];
 #define GAP_EVENT_LOCAL_OOB_DATA                                 0xDE
 
 
+/**
+ * @format HB11
+ * @param con_handle
+ * @param bd_addr
+ * @param ssp
+ * @param initiator
+ */
+#define GAP_EVENT_PAIRING_STARTED                                0xDF
+
+/**
+ * @format HB1
+ * @param con_handle
+ * @param bd_addr
+ * @param status
+ */
+#define GAP_EVENT_PAIRING_COMPLETE                               0xE0
+
 // Meta Events, see below for sub events
 #define HCI_EVENT_HSP_META                                       0xE8
 #define HCI_EVENT_HFP_META                                       0xE9
diff --git a/src/btstack_event.h b/src/btstack_event.h
index 914d6c222..d985b3709 100644
--- a/src/btstack_event.h
+++ b/src/btstack_event.h
@@ -35,9 +35,10 @@
  *
  */
 
+ 
 /**
  * HCI Event Getter
- *  
+ *
  * Note: Don't edit this file. It is generated by tool/btstack_event_generator.py
  *
  */
@@ -3461,6 +3462,71 @@ static inline void gap_event_local_oob_data_get_r_256(const uint8_t * event, uin
     reverse_bytes(&event[51], r_256, 16);
 }
 
+/**
+ * @brief Get field con_handle from event GAP_EVENT_PAIRING_STARTED
+ * @param event packet
+ * @return con_handle
+ * @note: btstack_type H
+ */
+static inline hci_con_handle_t gap_event_pairing_started_get_con_handle(const uint8_t * event){
+    return little_endian_read_16(event, 2);
+}
+/**
+ * @brief Get field bd_addr from event GAP_EVENT_PAIRING_STARTED
+ * @param event packet
+ * @param Pointer to storage for bd_addr
+ * @note: btstack_type B
+ */
+static inline void gap_event_pairing_started_get_bd_addr(const uint8_t * event, bd_addr_t bd_addr){
+    reverse_bytes(&event[4], bd_addr, 6);
+}
+/**
+ * @brief Get field initiator from event GAP_EVENT_PAIRING_STARTED
+ * @param event packet
+ * @return initiator
+ * @note: btstack_type 1
+ */
+static inline uint8_t gap_event_pairing_started_get_initiator(const uint8_t * event){
+    return event[10];
+}
+/**
+ * @brief Get field ssp from event GAP_EVENT_PAIRING_STARTED
+ * @param event packet
+ * @return ssp
+ * @note: btstack_type 1
+ */
+static inline uint8_t gap_event_pairing_started_get_ssp(const uint8_t * event){
+    return event[11];
+}
+
+/**
+ * @brief Get field con_handle from event GAP_EVENT_PAIRING_COMPLETE
+ * @param event packet
+ * @return con_handle
+ * @note: btstack_type H
+ */
+static inline hci_con_handle_t gap_event_pairing_complete_get_con_handle(const uint8_t * event){
+    return little_endian_read_16(event, 2);
+}
+/**
+ * @brief Get field bd_addr from event GAP_EVENT_PAIRING_COMPLETE
+ * @param event packet
+ * @param Pointer to storage for bd_addr
+ * @note: btstack_type B
+ */
+static inline void gap_event_pairing_complete_get_bd_addr(const uint8_t * event, bd_addr_t bd_addr){
+    reverse_bytes(&event[4], bd_addr, 6);
+}
+/**
+ * @brief Get field status from event GAP_EVENT_PAIRING_COMPLETE
+ * @param event packet
+ * @return status
+ * @note: btstack_type 1
+ */
+static inline uint8_t gap_event_pairing_complete_get_status(const uint8_t * event){
+    return event[10];
+}
+
 /**
  * @brief Get field status from event HCI_SUBEVENT_LE_CONNECTION_COMPLETE
  * @param event packet
diff --git a/tool/btstack_event_generator.py b/tool/btstack_event_generator.py
index e03a933aa..66b8363df 100755
--- a/tool/btstack_event_generator.py
+++ b/tool/btstack_event_generator.py
@@ -82,12 +82,11 @@ copyright = """/*
 """
 
 hfile_header_begin = """
-
-/*
- *  btstack_event.h
+ 
+/**
+ * HCI Event Getter
  *
- *  @brief BTstack event getter/setter
- *  @note  Don't edit - generated by tool/btstack_event_generator.py
+ * Note: Don't edit this file. It is generated by tool/btstack_event_generator.py
  *
  */