diff --git a/actube.workspace b/actube.workspace
index b8870938..361145ca 100644
--- a/actube.workspace
+++ b/actube.workspace
@@ -3,10 +3,10 @@
   <Project Name="ac" Path="ac.project" Active="No"/>
   <Project Name="wtp" Path="wtp.project" Active="No"/>
   <Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
-  <Project Name="mod_capwap" Path="mod_capwap.project" Active="Yes"/>
+  <Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
   <Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
   <Project Name="libcw" Path="libcw.project" Active="No"/>
-  <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
+  <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="Yes"/>
   <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Debug" Selected="yes">
diff --git a/mod_capwap80211.project b/mod_capwap80211.project
index 3edaaca7..ccd54962 100644
--- a/mod_capwap80211.project
+++ b/mod_capwap80211.project
@@ -8,6 +8,7 @@
         <File Name="src/mod/capwap80211/capwap80211_out_wtp_radio_cfg.c"/>
         <File Name="src/mod/capwap80211/capwap80211_actions_ac.c"/>
         <File Name="src/mod/capwap80211/mod_capwap80211.c"/>
+        <File Name="src/mod/capwap80211/capwap80211_messages.c"/>
       </VirtualDirectory>
     </VirtualDirectory>
   </VirtualDirectory>
diff --git a/src/mod/capwap80211/Makefile b/src/mod/capwap80211/Makefile
index 36841f41..eb184607 100644
--- a/src/mod/capwap80211/Makefile
+++ b/src/mod/capwap80211/Makefile
@@ -3,6 +3,7 @@ include ../../Defs.mak
 
 OBJS=\
 	mod_capwap80211.o \
+	capwap80211_messages.o \
 
 
 LIBDIR		:= ../../../lib
diff --git a/src/mod/capwap80211/capwap80211_messages.c b/src/mod/capwap80211/capwap80211_messages.c
new file mode 100644
index 00000000..29a08ab2
--- /dev/null
+++ b/src/mod/capwap80211/capwap80211_messages.c
@@ -0,0 +1,63 @@
+
+#include "cw/capwap.h"
+#include "cw/cw.h"
+#include "cw/dbg.h"
+#include "cw/capwap80211.h"
+
+
+#include "cw/msgset.h"
+
+#include "mod_capwap80211.h"
+
+
+
+static struct cw_ElemHandler handlers[] = {
+	{ 
+		"80211 WTP Radio Information",		/* name */
+		CAPWAP80211_ELEM_WTP_RADIO_INFORMATION,	/* Element ID */
+		0,0,					/* Vendor / Proto */
+		0,0,					/* min/max length */
+		NULL,					/* type */
+		"key",					/* Key */
+		NULL,					/* get */
+		NULL					/* put */
+	}
+};
+
+static int discovery_request_states[] = {CAPWAP_STATE_DISCOVERY,0};
+static struct cw_ElemDef discovery_request_elements[] ={
+	{0,0,CAPWAP80211_ELEM_WTP_RADIO_INFORMATION,	1, 0},
+	{0,0,0,0,0}
+
+};
+
+static struct cw_MsgDef messages[] = {
+	{
+		"Discovery Request",
+		CAPWAP_MSG_DISCOVERY_REQUEST,
+		CW_RECEIVER_AC,
+		discovery_request_states,
+		discovery_request_elements
+	}
+};
+
+
+
+
+
+
+
+struct cw_MsgSet * capwap80211_register_msg_set(set, mode)
+	struct cw_MsgSet * set;
+	int mode;
+{
+	if (mode != CW_MOD_MODE_BINDINGS)
+		return NULL;
+	
+	cw_dbg(DBG_INFO,"CAPWAP80211: Register messages");
+	
+	cw_msgset_add(set,messages, handlers);
+	cw_dbg(DBG_INFO,"CAPWAP0211: Done register messages");
+	
+	return set;
+}
diff --git a/src/mod/capwap80211/mod_capwap80211.h b/src/mod/capwap80211/mod_capwap80211.h
index 4fbedea0..491dbed8 100644
--- a/src/mod/capwap80211/mod_capwap80211.h
+++ b/src/mod/capwap80211/mod_capwap80211.h
@@ -1,11 +1,13 @@
 #ifndef __MOD_CAPWAP80211_H
 #define __MOD_CAPWAP80211_H
 
+
+/*
 struct cw_Mod *mod_capwap80211_ac();
 struct cw_Mod *mod_capwap80211_wtp();
 
 extern int capwap80211_register_actions_ac(struct cw_actiondef *def);
 extern int capwap80211_register_actions_wtp(struct cw_actiondef *def);
-
+*/
 
 #endif