diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 8f4cc7e6..0a57fc60 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-set (sems_SRCS
+SET (sems_SRCS
  AmAdvancedAudio.cpp
  AmApi.cpp
  AmArg.cpp
@@ -49,12 +49,9 @@ set (sems_SRCS
  sems.cpp
 )
 
-include_directories (${SEMS_SOURCE_DIR}/core/ampi)
-include_directories (${SEMS_SOURCE_DIR}/core/amci)
 
-configure_file( config.h.cmake ${SEMS_SOURCE_DIR}/core/config.h )
 
-add_executable (sems ${sems_SRCS})
-target_link_libraries(sems ${CMAKE_DL_LIBS} pthread stdc++ m)
+ADD_EXECUTABLE (sems ${sems_SRCS})
+TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} pthread stdc++ m)
 
-add_subdirectory (plug-in)
+ADD_SUBDIRECTORY(plug-in)
diff --git a/core/config.h b/core/config.h
index 07aeb914..66f9432b 100644
--- a/core/config.h
+++ b/core/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define SEMS_VERSION "1.1.0-pre"
+#define SEMS_VERSION "1.1.0-dev"
 #define OS "Linux"
 #define ARCH "32"
 
diff --git a/core/config.h.cmake b/core/config.h.cmake
deleted file mode 100644
index 02469ccc..00000000
--- a/core/config.h.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#cmakedefine SEMS_VERSION "@SEMS_VERSION@"
-#cmakedefine OS "@CMAKE_SYSTEM_NAME@"
-#cmakedefine ARCH "@ARCH@"
-
-#endif // CONFIG_H
\ No newline at end of file
diff --git a/core/plug-in/CMakeLists.txt b/core/plug-in/CMakeLists.txt
index f419ae7c..335fe432 100644
--- a/core/plug-in/CMakeLists.txt
+++ b/core/plug-in/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory (wav)
+ADD_SUBDIRECTORY (wav)
+ADD_SUBDIRECTORY (sipctrl)
diff --git a/core/plug-in/sipctrl/CMakeLists.txt b/core/plug-in/sipctrl/CMakeLists.txt
new file mode 100644
index 00000000..ba76327d
--- /dev/null
+++ b/core/plug-in/sipctrl/CMakeLists.txt
@@ -0,0 +1,25 @@
+set (sipctrl_SRCS
+  SipCtrlInterface.cpp
+  hash.cpp
+  hash_table.cpp
+  main.cpp
+  msg_fline.cpp
+  msg_hdrs.cpp
+  parse_common.cpp
+  parse_cseq.cpp
+  parse_from_to.cpp
+  parse_header.cpp
+  parse_uri.cpp
+  parse_via.cpp
+  resolver.cpp
+  sip_parser.cpp
+  sip_trans.cpp
+  trans_layer.cpp
+  transport.cpp
+  udp_trsp.cpp
+  wheeltimer.cpp
+)
+
+add_library(sipctrl SHARED ${sipctrl_SRCS})
+set_target_properties(sipctrl PROPERTIES PREFIX "")
+target_link_libraries(sipctrl ${CMAKE_DL_LIBS} pthread stdc++ m)