diff --git a/src/Defs.mak b/src/Defs.mak
index 99968044..5e329c84 100644
--- a/src/Defs.mak
+++ b/src/Defs.mak
@@ -3,6 +3,7 @@
 ARCH!=uname -m
 KERNEL!=uname -s
 
+
 #.endif
 
 
diff --git a/src/cw/Makefile b/src/cw/Makefile
index ef15c78d..d97c7a48 100644
--- a/src/cw/Makefile
+++ b/src/cw/Makefile
@@ -241,6 +241,22 @@ RADIOSRC=\
 	cw_read_radio_generic.c\
 
 
+#DTLSSRC += dtls_openssl.c \
+#	dtls_openssl_accept.c \
+#	dtls_openssl_connect.c \
+#	dtls_openssl_get_cipher.c \
+#	dtls_openssl_bio.c 
+#LIBS+=-lssl
+
+DTLSSRC+= dtls_gnutls.c \
+	dtls_gnutls_accept.c \
+	dtls_gnutls_connect.c \
+	dtls_gnutls_bio.c \
+	dtls_gnutls_get_cipher.c \
+	dtls_gnutls_get_peers_cert.c
+LIBS+=-lgnutls
+
+
 #SRC=$(wildcard *.c)
 SOURCES = $(CWSRC) $(LWSRC) $(MAVLSRC) $(MLISTSRC) $(SOCKSRC) $(LOGSRC) $(DTLSSRC) $(RADIOSRC) $(KTVSRC) $(MISCSRC)
 
diff --git a/src/cw/capwap.h b/src/cw/capwap.h
index 23b683c8..95cf0bdd 100644
--- a/src/cw/capwap.h
+++ b/src/cw/capwap.h
@@ -394,14 +394,12 @@
 //#define CAPWAP_CIPHER "AES128-SHA"
 */
 
-/*
-#ifdef WITH_GNUTLS
-#define CAPWAP_CIPHER	"+RSA:+AES-128-CBC:+SHA1:"
+
+#ifdef USE_OPENSSL
+	#define CAPWAP_CIPHER	"ALL"
+#else
+	#define CAPWAP_CIPHER	"+RSA:+AES-128-CBC:+SHA1:"
 #endif
-#ifdef WITH_OPENSSL
-#define CAPWAP_CIPHER	"ALL"
-#endif
-*/
 
 
 /**
diff --git a/src/cw/dtls.h b/src/cw/dtls.h
index 2dda02cc..fb4df195 100644
--- a/src/cw/dtls.h
+++ b/src/cw/dtls.h
@@ -24,7 +24,14 @@
 
 
 
-#if WITH_GNUTLS
+#ifdef USE_OPENSSL
+	#include "dtls_openssl.h"
+	#define dtls_init dtls_openssl_init
+	#define dtls_accept dtls_openssl_accept
+	#define dtls_connect dtls_openssl_connect
+	#define dtls_shutdown dtls_openssl_shutdown
+	#define dtls_get_cipher dtls_openssl_get_cipher
+#else
 	#include "dtls_gnutls.h"
 	#define dtls_init dtls_gnutls_init
 	#define dtls_accept dtls_gnutls_accept
@@ -34,15 +41,6 @@
 	#define dtls_get_peers_cert dtls_gnutls_get_peers_cert
 #endif
 
-#if WITH_OPENSSL
-	#include "dtls_openssl.h"
-	#define dtls_init dtls_openssl_init
-	#define dtls_accept dtls_openssl_accept
-	#define dtls_connect dtls_openssl_connect
-	#define dtls_shutdown dtls_openssl_shutdown
-	#define dtls_get_cipher dtls_openssl_get_cipher
-#endif
-
 
 
 #endif
diff --git a/src/cw/dtls_openssl_bio.c b/src/cw/dtls_openssl_bio.c
index 15701313..78a538f5 100644
--- a/src/cw/dtls_openssl_bio.c
+++ b/src/cw/dtls_openssl_bio.c
@@ -37,9 +37,11 @@
 
 BIO_METHOD *dtls_openssl_bio_method()
 {
-	static BIO_METHOD bio_methods;
+	BIO_METHOD * bio_methods;
+	bio_methods = BIO_mth_new(BIO_TYPE_DGRAM,"CW Packet");
 
-	bio_methods.type = BIO_TYPE_DGRAM;
+
+/*	bio_methods.type = BIO_TYPE_DGRAM;
 	bio_methods.name = "CW packet";
 	bio_methods.bwrite = dtls_openssl_bio_write;
 	bio_methods.bread = dtls_openssl_bio_read;
@@ -49,6 +51,7 @@ BIO_METHOD *dtls_openssl_bio_method()
 	bio_methods.create = dtls_openssl_bio_new;
 	bio_methods.destroy = dtls_openssl_bio_free;
 	bio_methods.callback_ctrl = 0;
+*/
 
 	return &bio_methods;
 }
diff --git a/src/mod/capwap/Makefile b/src/mod/capwap/Makefile
index 3df09770..2f91b3eb 100644
--- a/src/mod/capwap/Makefile
+++ b/src/mod/capwap/Makefile
@@ -1,32 +1,42 @@
 include ../../Defs.mak
 
 
-OBJS=\
-	mod_capwap_ac.o \
-	capwap_actions_ac.o \
-	capwap_in_wtp_board_data.o \
-	capwap_in_ac_descriptor.o \
-	capwap_out_wtp_board_data.o \
-	capwap_out_ac_descriptor.o \
-	capwap_out_get_idle_timeout.o \
-	capwap_out_wtp_descriptor.o \
-	capwap_in_wtp_descriptor.o \
-	capwap_out_ac_ip_list.o \
-	capwap_in_vendor_specific_payload.o \
-	capwap_in_mtu_discovery_padding.o \
-	capwap_out_capwap_control_ip_address.o \
-	capwap_in_capwap_control_ip_address.o \
-	capwap_out_capwap_local_ip_address.o\
+SOURCES=\
+	mod_capwap_ac.c \
+	capwap_actions_ac.c \
+	capwap_in_wtp_board_data.c \
+	capwap_in_ac_descriptor.c \
+	capwap_out_wtp_board_data.c \
+	capwap_out_ac_descriptor.c \
+	capwap_out_get_idle_timeout.c \
+	capwap_out_wtp_descriptor.c \
+	capwap_in_wtp_descriptor.c \
+	capwap_out_ac_ip_list.c \
+	capwap_in_vendor_specific_payload.c \
+	capwap_in_mtu_discovery_padding.c \
+	capwap_out_capwap_control_ip_address.c \
+	capwap_in_capwap_control_ip_address.c \
+	capwap_out_capwap_local_ip_address.c\
 
 
 LIBDIR		:= ../../../lib
-LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
-OBJDIR		:= ../../../obj/mod_capwap/$(ARCH)
+LIBARCHDIR      := $(LIBDIR)/$(KERNEL)/$(ARCH)
+OBJDIR          := ../../../obj/mod_capwap/$(KERNEL)/$(ARCH)
+
 SNAME		:= $(LIBARCHDIR)/libmod_capwap.a
 DNAME		:= $(LIBARCHDIR)/mod_capwap.so
-MODNAME		:= $(LIBDIR)/mod_capwap.so
-SLIBS		:= -lcw
-
-include ../Mod.mak
+#SLIBS		:= -lcw
+
+
+CFLAGS+=-fPIC
+CFLAGS+= -I ../../ -I../ -I../../include
+
+all: $(SNAME) $(DNAME) 
+static: $(SNAME)
+dynamic: $(DNAME)
+	
+
+include ../../lib.mk
+
 
 
diff --git a/src/mod/capwap80211/Makefile b/src/mod/capwap80211/Makefile
index eb184607..2f66279d 100644
--- a/src/mod/capwap80211/Makefile
+++ b/src/mod/capwap80211/Makefile
@@ -1,19 +1,25 @@
 include ../../Defs.mak
 
 
-OBJS=\
-	mod_capwap80211.o \
-	capwap80211_messages.o \
+SOURCES=\
+	mod_capwap80211.c \
+	capwap80211_messages.c \
 
 
 LIBDIR		:= ../../../lib
-LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
-OBJDIR		:= ../../../obj/mod_capwap80211/$(ARCH)
+LIBARCHDIR	:= $(LIBDIR)/$(KERNEL)/$(ARCH)
+OBJDIR		:= ../../../obj/mod_capwap80211/$(KERNEL)/$(ARCH)
 SNAME		:= $(LIBARCHDIR)/libmod_capwap80211.a
 DNAME		:= $(LIBARCHDIR)/mod_capwap80211.so
-MODNAME		:= $(LIBDIR)/mod_capwap80211.so
 SLIBS		:= -lcw
 
-include ../Mod.mak
+CFLAGS+=-fPIC
+CFLAGS+= -I ../../ -I../ -I../../include
+
+all: $(SNAME) $(DNAME) 
+static: $(SNAME)
+dynamic: $(DNAME)
+
+include ../../lib.mk
 
 
diff --git a/src/mod/cisco/Makefile b/src/mod/cisco/Makefile
index 111cb156..0104dc9f 100644
--- a/src/mod/cisco/Makefile
+++ b/src/mod/cisco/Makefile
@@ -2,18 +2,18 @@ include ../../Defs.mak
 
 
 
-OBJS=\
-	mod_cisco_ac.o \
-	cisco_actions_ac.o \
-	cisco_in_wtp_descriptor.o \
-	cisco_out_wtp_descriptor.o \
-	cisco_in_ac_descriptor.o\
-	cisco_out_ac_descriptor.o\
-	cisco_out_radio_generic.o\
-	cisco_out_ap_timesync.o\
-	cisco_in_spam_vendor_specific.o\
-	cisco_out_lw_path_mtu.o\
-	cisco_out_capwap_local_ip_address.o
+SOURCES=\
+	mod_cisco_ac.c \
+	cisco_actions_ac.c \
+	cisco_in_wtp_descriptor.c \
+	cisco_out_wtp_descriptor.c \
+	cisco_in_ac_descriptor.c\
+	cisco_out_ac_descriptor.c\
+	cisco_out_radio_generic.c\
+	cisco_out_ap_timesync.c\
+	cisco_in_spam_vendor_specific.c\
+	cisco_out_lw_path_mtu.c\
+	cisco_out_capwap_local_ip_address.c
 
 
 #	cisco80211.o \
@@ -39,14 +39,18 @@ OBJS=\
 
 	
 LIBDIR		:= ../../../lib
-LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
-OBJDIR		:= ../../../obj/mod_cisco/$(ARCH)
+LIBARCHDIR	:= $(LIBDIR)/$(KERNEL)/$(ARCH)
+OBJDIR		:= ../../../obj/mod_cisco/$(KERNEL)/$(ARCH)
 SNAME		:= $(LIBARCHDIR)/libmod_cisco.a
 DNAME		:= $(LIBARCHDIR)/mod_cisco.so
-MODNAME		:= $(LIBDIR)/mod_cisco.so
-SLIBS		:= -lcw -lconfuse
-
-
-include ../Mod.mak
+
+CFLAGS+=-fPIC
+CFLAGS+= -I ../../ -I../ -I../../include
+
+all: $(SNAME) $(DNAME) 
+static: $(SNAME)
+dynamic: $(DNAME)
+
+include ../../lib.mk
 
 
diff --git a/src/wtp/Makefile b/src/wtp/Makefile
index b629aa5d..29e731d2 100644
--- a/src/wtp/Makefile
+++ b/src/wtp/Makefile
@@ -5,9 +5,9 @@ OBJDIR=./o
 LIBDIR		:= ../../lib
 LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
 
-CFLAGS+=-I../ -DWITH_GNUTLS
+CFLAGS+=-I../ 
 LDFLAGS=-L$(LIBARCHDIR) 
-LIBS=-lcw -lnettle -lgnutls -ldl
+LIBS+=-lcw -lnettle -lgnutls -ldl 
 
 SOURCES=\
      	wtp_main.c\
@@ -17,6 +17,4 @@ SOURCES=\
 	run.c\
 	changestate.c
 
-
-
 include ../prog.mk
diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c
index 5e37261f..cf3bda26 100644
--- a/src/wtp/wtp_main.c
+++ b/src/wtp/wtp_main.c
@@ -194,7 +194,7 @@ exit(0);
 	cw_discovery_init_results(&dis);
 /*cw_run_discovery(conn, "255.255.255.255","192.168.56.1", &dis);*/
 /*	cw_run_discovery(conn, "255.255.255.255",NULL, &dis);*/
-	cw_run_discovery(conn, "192.168.0.162","192.168.0.29", &dis);
+	cw_run_discovery(conn, "192.168.0.162","192.168.0.14", &dis);
 
 	cw_dbg_ktv_dump(dis.prio_ip, DBG_INFO, "=== IP list ===", "IP", "=== END IP List ===");