diff --git a/src/mod/capwap/Makefile b/src/mod/capwap/Makefile
index 48b3fe9d..0af8992b 100644
--- a/src/mod/capwap/Makefile
+++ b/src/mod/capwap/Makefile
@@ -8,7 +8,8 @@ OBJS=\
 	capwap_in_wtp_board_data.o \
 	capwap_out_wtp_descriptor.o \
 	capwap_out_ac_descriptor.o \
-	capwap_out_get_session_id.o
+	capwap_out_get_session_id.o \
+	capwap_out_get_idle_timeout.o 
 
 
 NAME=libcapwap.a
diff --git a/src/mod/capwap/capwap_actions_ac.c b/src/mod/capwap/capwap_actions_ac.c
index 473c2a07..5aa0c615 100644
--- a/src/mod/capwap/capwap_actions_ac.c
+++ b/src/mod/capwap/capwap_actions_ac.c
@@ -115,8 +115,6 @@ static cw_action_in_t actions_in[] = {
 	/* ---------------------------------------------------------------------------
 	 * Join Request 
 	 */
-
-	
 	{
 		.capwap_state = CW_STATE_JOIN, 
 		.msg_id = CW_MSG_JOIN_REQUEST,
@@ -237,6 +235,19 @@ static cw_action_in_t actions_in[] = {
 
 
 
+	/* ---------------------------------------------------------------------------
+	 * Configuration Status Request 
+	 */
+	{
+		.capwap_state = CW_STATE_CONFIGURE, 
+		.msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST,
+//		.end = cw_in_check_join_req
+	}
+	,
+
+
+
+
 	/* End of list */
 	{0, 0}
 };
@@ -286,6 +297,8 @@ static cw_action_out_t actions_out[]={
 	 * Join Response Message
 	 */
 
+	/* Result Code - Join Response */
+
 	{
 		.msg_id = CW_MSG_JOIN_RESPONSE, 
 		.elem_id = CW_ELEM_RESULT_CODE,
@@ -296,6 +309,22 @@ static cw_action_out_t actions_out[]={
 	}
 	,
 
+	/* ---------------------------------------------------
+	 * Configuration Status Response Message
+	 */
+
+	{
+		.msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, 
+		.elem_id = CW_ELEM_IDLE_TIMEOUT,
+		.item_id = CW_ITEM_IDLE_TIMEOUT,
+	 	.out = cw_out_generic, 
+		.get = capwap_out_get_idle_timeout,
+		.mand = 1
+	}
+	,
+
+	
+
 
 	{0,0}
 };
diff --git a/src/mod/capwap/mod_capwap.h b/src/mod/capwap/mod_capwap.h
index f8d706b4..6f4ba9a8 100644
--- a/src/mod/capwap/mod_capwap.h
+++ b/src/mod/capwap/mod_capwap.h
@@ -18,5 +18,7 @@ extern int capwap_out_ac_descriptor(struct conn *conn,struct cw_action_out * a,u
 
 extern struct mbag_item * capwap_out_get_session_id(struct conn *conn,struct cw_action_out * a);
 
+extern struct mbag_item * capwap_out_get_idle_timeout(struct conn *conn,struct cw_action_out * a);
+
 
 #endif