diff --git a/openair2/COMMON/rrc_messages_def.h b/openair2/COMMON/rrc_messages_def.h
index 0ab7dcde598af0f37448dcdf6224aa56ae52efe6..fa63dccd3154f2389d7d7cf5dadbc13c507bf68c 100644
--- a/openair2/COMMON/rrc_messages_def.h
+++ b/openair2/COMMON/rrc_messages_def.h
@@ -18,6 +18,8 @@ MESSAGE_DEF(RRC_UL_CCCH_MESSAGE,        MESSAGE_PRIORITY_MED_PLUS,  RrcUlCcchMes
 MESSAGE_DEF(RRC_UL_DCCH_MESSAGE,        MESSAGE_PRIORITY_MED_PLUS,  RrcUlDcchMessage,           rrc_ul_dcch_message)
 #endif
 
+MESSAGE_DEF(RRC_STATE_IND,              MESSAGE_PRIORITY_MED,       RrcStateInd,                rrc_state_ind)
+
 //-------------------------------------------------------------------------------------------//
 // eNB: ENB_APP -> RRC messages
 MESSAGE_DEF(RRC_CONFIGURATION_REQ,      MESSAGE_PRIORITY_MED,       RrcConfigurationReq,        rrc_configuration_req)
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index 6ffb391c2ac2c6cad5788915d95a5c0749d9032b..81083c0cb609a40095222594478e6058b329c41a 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -9,6 +9,7 @@
 #define RRC_MESSAGES_TYPES_H_
 
 #include "as_message.h"
+#include "rrc_types.h"
 
 //-------------------------------------------------------------------------------------------//
 // Messages for RRC logging
@@ -30,6 +31,8 @@ typedef UL_DCCH_Message_t       RrcUlDcchMessage;
 
 //-------------------------------------------------------------------------------------------//
 // Defines to access message fields.
+#define RRC_STATE_IND(mSGpTR)           (mSGpTR)->ittiMsg.rrc_state_ind
+
 #define RRC_CONFIGURATION_REQ(mSGpTR)   (mSGpTR)->ittiMsg.rrc_configuration_req
 
 #define NAS_CELL_SELECTION_REQ(mSGpTR)  (mSGpTR)->ittiMsg.nas_cell_selection_req
@@ -47,6 +50,11 @@ typedef UL_DCCH_Message_t       RrcUlDcchMessage;
 #define NAS_DOWNLINK_DATA_IND(mSGpTR)   (mSGpTR)->ittiMsg.nas_dl_data_ind
 
 //-------------------------------------------------------------------------------------------//
+typedef struct RrcStateInd_s{
+    Rrc_State_t     state;
+    Rrc_Sub_State_t sub_state;
+} RrcStateInd;
+
 // eNB: ENB_APP -> RRC messages
 typedef struct RrcConfigurationReq_s {
     uint32_t cell_identity;