diff --git a/src/Config.mak b/src/Config.mak
index 21a0e8ff..ab7712b1 100644
--- a/src/Config.mak
+++ b/src/Config.mak
@@ -1,5 +1,11 @@
-#
 
+#Define SSL Library: OPENSSL or GNUTLS
+SSL_LIBRARY=OPENSSL
+
+# use openssl library in ../contrib/
 USE_CONTRIB_OPENSSL=1
 
 
+CONF_LIBRARY=UCI
+USE_CONTRIB_UCI=1
+
diff --git a/src/capwap/dtls_openssl.c b/src/capwap/dtls_openssl.c
index 96541e83..7bb93031 100644
--- a/src/capwap/dtls_openssl.c
+++ b/src/capwap/dtls_openssl.c
@@ -312,7 +312,7 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SS
 
 //	SSL_CTX_set_tmp_rsa_callback(d->ctx,tmp_rsa_callback);
 
-	SSL_CTX_set_mode(d->ctx,SSL_MODE_SEND_SERVERHELLO_TIME);
+//	SSL_CTX_set_mode(d->ctx,SSL_MODE_SEND_SERVERHELLO_TIME);
 
 
 
diff --git a/src/wtp/Makefile b/src/wtp/Makefile
index 25feb838..c1d1416f 100644
--- a/src/wtp/Makefile
+++ b/src/wtp/Makefile
@@ -9,6 +9,13 @@ endif
 ifdef LIB_DIR
 	XLIB=-L $(LIB_DIR)
 endif 
+include ../Config.mak
+
+
+ifeq ($(USE_CONTRIB_UCI),1)
+CFLAGS+=-I../contrib/uci
+endif
+
 
 WITH_UCI=1 
 
@@ -81,7 +88,7 @@ ALL=wtp
 
 all: $(ALL)
 
-Q=@
+Q=
 E=echo
 ifeq ($(V), 1)
 Q=