diff --git a/src/mod/capwap/capwap_actions_ac.c b/src/mod/capwap/capwap_actions_ac.c
index c6dc559b..f35e7d90 100644
--- a/src/mod/capwap/capwap_actions_ac.c
+++ b/src/mod/capwap/capwap_actions_ac.c
@@ -500,6 +500,51 @@ static cw_action_out_t actions_out[]={
 	}
 	,
 
+	/* AC Name - Join Response */
+	{
+		.msg_id = CW_MSG_JOIN_RESPONSE,
+		.elem_id = CW_ELEM_AC_NAME,
+		.item_id = CW_ITEM_AC_NAME,
+		.out = cw_out_generic,
+	       	.get = cw_out_get_local,
+		.mand = 1
+	}
+	,
+
+	/* AC Descriptor - Join Response */
+	{
+		.msg_id = CW_MSG_JOIN_RESPONSE, 
+		.item_id = CW_ITEM_AC_DESCRIPTOR, 
+		.elem_id  = CW_ELEM_AC_DESCRIPTOR,
+		.out = capwap_out_ac_descriptor,
+		.mand = 1
+	}
+	,
+
+
+	/* Capwap Local IPv4/IPv6 Address - Join Response */
+	{
+		.msg_id = CW_MSG_JOIN_RESPONSE, 
+		.item_id = CW_ITEM_CAPWAP_CONTROL_IP_ADDRESS_LIST,
+	 	.out = cw_out_capwap_control_ip_addr_list, 
+		.get = cw_out_get_outgoing,
+		.mand = 1
+	}
+	,
+
+	/* ECN Support - Join Response */
+	{
+		.msg_id = CW_MSG_JOIN_RESPONSE, 
+		.elem_id  = CW_ELEM_ECN_SUPPORT,
+		.item_id = CW_ITEM_ECN_SUPPORT, 
+		.out = cw_out_generic,
+		.get = cw_out_get_config,
+		.mand = 1
+	}
+	,
+
+
+
 	/* ---------------------------------------------------
 	 * Configuration Status Response Message
 	 */
diff --git a/src/mod/capwap80211/capwap80211_actions_ac.c b/src/mod/capwap80211/capwap80211_actions_ac.c
index 8458b576..01782567 100644
--- a/src/mod/capwap80211/capwap80211_actions_ac.c
+++ b/src/mod/capwap80211/capwap80211_actions_ac.c
@@ -4,6 +4,7 @@
 #include "cw/cw.h"
 #include "cw/capwap.h"
 #include "cw/capwap80211.h"
+#include "cw/capwap_items.h"
 
 //#include "capwap_80211_actions.h"
 //#include "capwap_80211.h"
@@ -68,7 +69,39 @@ static cw_action_in_t actions_ac_in[] = {
 };
 
 
-cw_action_out_t capwap_80211_actions_ac_out[]={
+cw_action_out_t actions_ac_out[]={
+	
+	/* --------------------------------------------------------
+	 * Discovery Response
+	 */
+
+
+	/* 802.11 Radio Information - Discovery Response */
+	{
+		.msg_id = CW_MSG_DISCOVERY_RESPONSE, 
+		.item_id = CW_ITEM_RADIO_INFOS ,
+	 	.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION, 
+		.out = cw_out_radio_infos, 
+		.mand = 1
+	}
+	,
+
+	/* --------------------------------------------------------
+	 * Join Response
+	 */
+
+
+	/* 802.11 Radio Information - Discovery Response */
+	{
+		.msg_id = CW_MSG_JOIN_RESPONSE, 
+		.item_id = CW_ITEM_RADIO_INFOS ,
+	 	.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION, 
+		.out = cw_out_radio_infos, 
+		.mand = 1
+	}
+	,
+
+
 	/* Radio Infos */
 //	{CW_MSG_DISCOVERY_RESPONSE, NULL /*CW_ELEM80211_WTP_RADIO_INFORMATION*/, 0,
 //	 CW_ELEM80211_WTP_RADIO_INFORMATION, NULL,cw_out_radio_infos, NULL,1}
@@ -86,7 +119,7 @@ int capwap80211_register_actions_ac(struct cw_actiondef *def)
 
 	int rc;
 	rc=cw_actionlist_in_register_actions(def->in, actions_ac_in);
-//	rc+=cw_actionlist_out_register_actions(def->out, capwap_80211_actions_ac_out);
+	rc+=cw_actionlist_out_register_actions(def->out, actions_ac_out);
 
 	rc+= cw_strheap_register_strings(def->strelem, capwap_strings_elem80211);
 	/*rc += cw_strheap_register_strings(def->strelem, capwap_strings_elem);
diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c
index d9c956b4..b77ac8e8 100644
--- a/src/wtp/wtp_main.c
+++ b/src/wtp/wtp_main.c
@@ -139,10 +139,10 @@ int main()
 //      cw_register_actions_cipwap_wtp(&capwap_actions);
 //      cw_register_actions_capwap_80211_wtp(&capwap_actions);
 //
-#define CWMOD "cisco"
-#define CWBIND "cisco"
-//#define CWMOD "capwap"
-//#define CWBIND "capwap80211"
+//#define CWMOD "cisco"
+//#define CWBIND "cisco"
+#define CWMOD "capwap"
+#define CWBIND "capwap80211"
 
 
 	struct mod_wtp *mod = modload_wtp(CWMOD);