diff --git a/src/mod/cipwap/Makefile b/src/mod/cipwap/Makefile
index a16c9a15..4e931050 100644
--- a/src/mod/cipwap/Makefile
+++ b/src/mod/cipwap/Makefile
@@ -1,13 +1,23 @@
+include ../../Macros.mak
+include ../../Config.mak
+include ../../Config.local.mak
 
 OBJS=\
 	mod_cipwap_ac.o \
-	mod_cipwap_wtp.o \
 	cipwap_actions_ac.o \
 	cipwap_actions_wtp.o \
 	cipwap_items.o \
 
+NAME		:= cipwap
+
+LIBDIR		:= ../../../lib
+LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
+OBJDIR		:= ../../../obj/mod_$(NAME)/$(ARCH)
+SNAME		:= $(LIBARCHDIR)/libmod_$(NAME).a
+DNAME		:= $(LIBARCHDIR)/mod_$(NAME).so
+MODNAME		:= $(LIBDIR)/mod_$(NAME).so
+SLIBS		:= -lcw 
 
-NAME=libcipwap.a
 
 include ../Mod.mak
 
diff --git a/src/mod/cisco/Makefile b/src/mod/cisco/Makefile
index c0732cd8..e1947683 100644
--- a/src/mod/cisco/Makefile
+++ b/src/mod/cisco/Makefile
@@ -1,7 +1,10 @@
+include ../../Macros.mak
+include ../../Config.mak
+include ../../Config.local.mak
+
 
 OBJS=\
 	mod_cisco_ac.o \
-	mod_cisco_wtp.o \
 	cisco_actions_ac.o \
 	cisco_actions_wtp.o \
 	cisco_out_ap_timesync.o \
@@ -31,8 +34,14 @@ OBJS=\
 #	cisco_out_radio_administrative_state.o \
 
 	
+LIBDIR		:= ../../../lib
+LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
+OBJDIR		:= ../../../obj/mod_cisco/$(ARCH)
+SNAME		:= $(LIBARCHDIR)/libmod_cisco.a
+DNAME		:= $(LIBARCHDIR)/mod_cisco.so
+MODNAME		:= $(LIBDIR)/mod_cisco.so
+SLIBS		:= -lcw -lmod_cipwap -lmod_capwap
 
-NAME=libcisco.a
 
 include ../Mod.mak
 
diff --git a/src/mod/cisco/cisco_out_wtp_descriptor.c b/src/mod/cisco/cisco_out_wtp_descriptor.c
index 46fad8a1..b861d7b7 100644
--- a/src/mod/cisco/cisco_out_wtp_descriptor.c
+++ b/src/mod/cisco/cisco_out_wtp_descriptor.c
@@ -6,12 +6,13 @@
 
 #include "cisco.h"
 
-extern mbag_t cisco_config_wtp;
+//#extern mbag_t cisco_config_wtp;
 
 int cisco_out_wtp_descriptor(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
 {
 
-	mbag_t mbag = cisco_config_wtp;
+//	mbag_t mbag = cisco_config_wtp;
+mbag_t mbag = NULL;
 
 	// XXX Dummy WTP Descriptor Header
 	uint8_t *d = dst+4;
diff --git a/src/mod/cisco/mod_cisco_ac.c b/src/mod/cisco/mod_cisco_ac.c
index 08c05db1..6c53dd5e 100644
--- a/src/mod/cisco/mod_cisco_ac.c
+++ b/src/mod/cisco/mod_cisco_ac.c
@@ -27,7 +27,7 @@ static int register_actions(struct cw_actiondef *actions, int mode)
 		case CW_MOD_MODE_CAPWAP:
 		{
 
-			struct cw_Mod *cmod = modload_ac("cipwap");
+			struct cw_Mod *cmod = NULL; //modload_ac("cipwap");
 			if (!cmod) {
 				cw_log(LOG_ERR,
 				       "Can't initialize mod_cisco, failed to load base mod mod_cipwap");
@@ -40,7 +40,7 @@ static int register_actions(struct cw_actiondef *actions, int mode)
 		}
 		case MOD_MODE_BINDINGS:
 		{
-			struct cw_Mod *cmod = modload_ac("capwap80211");
+			struct cw_Mod *cmod = NULL; //modload_ac("capwap80211");
 			if (!cmod) {
 				cw_log(LOG_ERR,
 				       "Can't initialize mod_cisco, failed to load base mod mod_capwap80211");
@@ -180,3 +180,7 @@ struct cw_Mod *mod_cisco_ac()
 };
 
 
+struct cw_Mod *mod_cisco()
+{
+	return &capwap_ac;
+};