diff --git a/client/tarantool/tnt.c b/client/tarantool/tnt.c
index f42574e4e7cea8f6c5fb649c95fe80ab3ef80657..1b46a41892e8baa51d034ed02838801e135e2b94 100644
--- a/client/tarantool/tnt.c
+++ b/client/tarantool/tnt.c
@@ -39,9 +39,9 @@
 #include <errcode.h>
 #include <third_party/gopt/gopt.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_sql.h>
-#include <connector/c/include/libtnt/tnt_net.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_sql.h>
+#include <connector/c/include/tarantool/tnt_net.h>
 
 #include <client/tarantool/tnt_admin.h>
 
diff --git a/connector/c/CMakeLists.txt b/connector/c/CMakeLists.txt
index 1d94e5179d3545d57a4afadccd69d65489b9af9c..847182669fcdbbb601d14a425dad05823352af7f 100644
--- a/connector/c/CMakeLists.txt
+++ b/connector/c/CMakeLists.txt
@@ -1,3 +1,13 @@
+
+#
+# library soname version
+#
+set(LIBTNT_VERSION_MAJOR "1")
+set(LIBTNT_VERSION_MINOR "1")
+
+set(LIBTNT_VERSION   "${LIBTNT_VERSION_MAJOR}.${LIBTNT_VERSION_MINOR}")
+set(LIBTNT_SOVERSION "${LIBTNT_VERSION_MAJOR}")
+
 add_subdirectory(tnt)
 add_subdirectory(tntsql)
 add_subdirectory(tntnet)
diff --git a/connector/c/include/CMakeLists.txt b/connector/c/include/CMakeLists.txt
index ced3d1c21177cbd549567c189ccf96b7dbe31a29..a47ec7c2e8a6c20f4154ebb04905fc10902ed634 100644
--- a/connector/c/include/CMakeLists.txt
+++ b/connector/c/include/CMakeLists.txt
@@ -3,4 +3,4 @@
 # installation of tarantool C client library headers
 #
 
-install(DIRECTORY libtnt DESTINATION include)
+install(DIRECTORY tarantool DESTINATION include)
diff --git a/connector/c/include/libtnt/tnt.h b/connector/c/include/tarantool/tnt.h
similarity index 76%
rename from connector/c/include/libtnt/tnt.h
rename to connector/c/include/tarantool/tnt.h
index cd99df63b3530d0a62a1117809e6e57393f08502..c67e012424c805c29cd9e73f0d98736e9044d79d 100644
--- a/connector/c/include/libtnt/tnt.h
+++ b/connector/c/include/tarantool/tnt.h
@@ -33,20 +33,20 @@ extern "C" {
 #include <stdint.h>
 #include <stdarg.h>
 
-#include <libtnt/tnt_mem.h>
-#include <libtnt/tnt_proto.h>
-#include <libtnt/tnt_enc.h>
-#include <libtnt/tnt_tuple.h>
-#include <libtnt/tnt_reply.h>
-#include <libtnt/tnt_stream.h>
-#include <libtnt/tnt_iter.h>
-#include <libtnt/tnt_buf.h>
-#include <libtnt/tnt_ping.h>
-#include <libtnt/tnt_insert.h>
-#include <libtnt/tnt_update.h>
-#include <libtnt/tnt_delete.h>
-#include <libtnt/tnt_call.h>
-#include <libtnt/tnt_select.h>
+#include <tarantool/tnt_mem.h>
+#include <tarantool/tnt_proto.h>
+#include <tarantool/tnt_enc.h>
+#include <tarantool/tnt_tuple.h>
+#include <tarantool/tnt_reply.h>
+#include <tarantool/tnt_stream.h>
+#include <tarantool/tnt_iter.h>
+#include <tarantool/tnt_buf.h>
+#include <tarantool/tnt_ping.h>
+#include <tarantool/tnt_insert.h>
+#include <tarantool/tnt_update.h>
+#include <tarantool/tnt_delete.h>
+#include <tarantool/tnt_call.h>
+#include <tarantool/tnt_select.h>
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/connector/c/include/libtnt/tnt_buf.h b/connector/c/include/tarantool/tnt_buf.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_buf.h
rename to connector/c/include/tarantool/tnt_buf.h
diff --git a/connector/c/include/libtnt/tnt_call.h b/connector/c/include/tarantool/tnt_call.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_call.h
rename to connector/c/include/tarantool/tnt_call.h
diff --git a/connector/c/include/libtnt/tnt_delete.h b/connector/c/include/tarantool/tnt_delete.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_delete.h
rename to connector/c/include/tarantool/tnt_delete.h
diff --git a/connector/c/include/libtnt/tnt_enc.h b/connector/c/include/tarantool/tnt_enc.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_enc.h
rename to connector/c/include/tarantool/tnt_enc.h
diff --git a/connector/c/include/libtnt/tnt_insert.h b/connector/c/include/tarantool/tnt_insert.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_insert.h
rename to connector/c/include/tarantool/tnt_insert.h
diff --git a/connector/c/include/libtnt/tnt_io.h b/connector/c/include/tarantool/tnt_io.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_io.h
rename to connector/c/include/tarantool/tnt_io.h
diff --git a/connector/c/include/libtnt/tnt_iob.h b/connector/c/include/tarantool/tnt_iob.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_iob.h
rename to connector/c/include/tarantool/tnt_iob.h
diff --git a/connector/c/include/libtnt/tnt_iter.h b/connector/c/include/tarantool/tnt_iter.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_iter.h
rename to connector/c/include/tarantool/tnt_iter.h
diff --git a/connector/c/include/libtnt/tnt_lex.h b/connector/c/include/tarantool/tnt_lex.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_lex.h
rename to connector/c/include/tarantool/tnt_lex.h
diff --git a/connector/c/include/libtnt/tnt_mem.h b/connector/c/include/tarantool/tnt_mem.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_mem.h
rename to connector/c/include/tarantool/tnt_mem.h
diff --git a/connector/c/include/libtnt/tnt_net.h b/connector/c/include/tarantool/tnt_net.h
similarity index 97%
rename from connector/c/include/libtnt/tnt_net.h
rename to connector/c/include/tarantool/tnt_net.h
index c9249744bbd75fd91b1875dc4dfcb70986d4dcd4..19ada6ee09c482e5c8868970dcb2701e6aa0f86c 100644
--- a/connector/c/include/libtnt/tnt_net.h
+++ b/connector/c/include/tarantool/tnt_net.h
@@ -32,8 +32,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <libtnt/tnt_opt.h>
-#include <libtnt/tnt_iob.h>
+#include <tarantool/tnt_opt.h>
+#include <tarantool/tnt_iob.h>
 
 enum tnt_error {
 	TNT_EOK,
diff --git a/connector/c/include/libtnt/tnt_opt.h b/connector/c/include/tarantool/tnt_opt.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_opt.h
rename to connector/c/include/tarantool/tnt_opt.h
diff --git a/connector/c/include/libtnt/tnt_ping.h b/connector/c/include/tarantool/tnt_ping.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_ping.h
rename to connector/c/include/tarantool/tnt_ping.h
diff --git a/connector/c/include/libtnt/tnt_proto.h b/connector/c/include/tarantool/tnt_proto.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_proto.h
rename to connector/c/include/tarantool/tnt_proto.h
diff --git a/connector/c/include/libtnt/tnt_queue.h b/connector/c/include/tarantool/tnt_queue.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_queue.h
rename to connector/c/include/tarantool/tnt_queue.h
diff --git a/connector/c/include/libtnt/tnt_reply.h b/connector/c/include/tarantool/tnt_reply.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_reply.h
rename to connector/c/include/tarantool/tnt_reply.h
diff --git a/connector/c/include/libtnt/tnt_select.h b/connector/c/include/tarantool/tnt_select.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_select.h
rename to connector/c/include/tarantool/tnt_select.h
diff --git a/connector/c/include/libtnt/tnt_sql.h b/connector/c/include/tarantool/tnt_sql.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_sql.h
rename to connector/c/include/tarantool/tnt_sql.h
diff --git a/connector/c/include/libtnt/tnt_stream.h b/connector/c/include/tarantool/tnt_stream.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_stream.h
rename to connector/c/include/tarantool/tnt_stream.h
diff --git a/connector/c/include/libtnt/tnt_tuple.h b/connector/c/include/tarantool/tnt_tuple.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_tuple.h
rename to connector/c/include/tarantool/tnt_tuple.h
diff --git a/connector/c/include/libtnt/tnt_update.h b/connector/c/include/tarantool/tnt_update.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_update.h
rename to connector/c/include/tarantool/tnt_update.h
diff --git a/connector/c/include/libtnt/tnt_utf8.h b/connector/c/include/tarantool/tnt_utf8.h
similarity index 100%
rename from connector/c/include/libtnt/tnt_utf8.h
rename to connector/c/include/tarantool/tnt_utf8.h
diff --git a/connector/c/tnt/CMakeLists.txt b/connector/c/tnt/CMakeLists.txt
index f0add390210e8afc0e51a1ef4927c01a6f79c27f..7f0899314410d73decdea91a9a691453fd6a5a53 100644
--- a/connector/c/tnt/CMakeLists.txt
+++ b/connector/c/tnt/CMakeLists.txt
@@ -48,19 +48,21 @@ string(REPLACE "-static" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 #
 # Static library
 #
-
 project(tnt)
 add_library(tnt STATIC ${tnt_sources})
 set_target_properties(tnt PROPERTIES COMPILE_FLAGS "${tnt_cflags}")
+set_target_properties(tnt PROPERTIES VERSION ${LIBTNT_VERSION} SOVERSION ${LIBTNT_SOVERSION})
+set_target_properties(tnt PROPERTIES OUTPUT_NAME "tarantool")
 
 #
 # Shared library
 #
-
 project(tnt_shared)
 add_library(tnt_shared SHARED ${tnt_sources})
 set_target_properties(tnt_shared PROPERTIES OUTPUT_NAME tnt)
 set_target_properties(tnt_shared PROPERTIES COMPILE_FLAGS "${tnt_cflags}")
+set_target_properties(tnt_shared PROPERTIES VERSION ${LIBTNT_VERSION} SOVERSION ${LIBTNT_SOVERSION})
+set_target_properties(tnt_shared PROPERTIES OUTPUT_NAME "tarantool")
 
 #----------------------------------------------------------------------------#
 # Install
diff --git a/connector/c/tnt/tnt_buf.c b/connector/c/tnt/tnt_buf.c
index 6889ae819ce3ecac78401ff1bfd19cfe3903dccf..358caa08d86950986bda562213db34238002a3db 100644
--- a/connector/c/tnt/tnt_buf.c
+++ b/connector/c/tnt/tnt_buf.c
@@ -28,11 +28,11 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_mem.h>
-#include <connector/c/include/libtnt/tnt_tuple.h>
-#include <connector/c/include/libtnt/tnt_reply.h>
-#include <connector/c/include/libtnt/tnt_stream.h>
-#include <connector/c/include/libtnt/tnt_buf.h>
+#include <connector/c/include/tarantool/tnt_mem.h>
+#include <connector/c/include/tarantool/tnt_tuple.h>
+#include <connector/c/include/tarantool/tnt_reply.h>
+#include <connector/c/include/tarantool/tnt_stream.h>
+#include <connector/c/include/tarantool/tnt_buf.h>
 
 static struct tnt_stream *tnt_buf_tryalloc(struct tnt_stream *s) {
 	if (s) {
diff --git a/connector/c/tnt/tnt_call.c b/connector/c/tnt/tnt_call.c
index e33d57e13a921ed62f5c8ebebefe75ada016c093..529c986c5a7dda1ebd1c10ec2c2cbcc7873a06cd 100644
--- a/connector/c/tnt/tnt_call.c
+++ b/connector/c/tnt/tnt_call.c
@@ -28,12 +28,12 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_proto.h>
-#include <connector/c/include/libtnt/tnt_enc.h>
-#include <connector/c/include/libtnt/tnt_tuple.h>
-#include <connector/c/include/libtnt/tnt_reply.h>
-#include <connector/c/include/libtnt/tnt_stream.h>
-#include <connector/c/include/libtnt/tnt_call.h>
+#include <connector/c/include/tarantool/tnt_proto.h>
+#include <connector/c/include/tarantool/tnt_enc.h>
+#include <connector/c/include/tarantool/tnt_tuple.h>
+#include <connector/c/include/tarantool/tnt_reply.h>
+#include <connector/c/include/tarantool/tnt_stream.h>
+#include <connector/c/include/tarantool/tnt_call.h>
 
 struct tnt_header_call {
 	uint32_t flags;
diff --git a/connector/c/tnt/tnt_delete.c b/connector/c/tnt/tnt_delete.c
index 40ca890d169f9e8428bf447e027ad7c1bb6fe562..8539a7c326648964b6826d777d7c5678f3d1f787 100644
--- a/connector/c/tnt/tnt_delete.c
+++ b/connector/c/tnt/tnt_delete.c
@@ -28,11 +28,11 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_proto.h>
-#include <connector/c/include/libtnt/tnt_tuple.h>
-#include <connector/c/include/libtnt/tnt_reply.h>
-#include <connector/c/include/libtnt/tnt_stream.h>
-#include <connector/c/include/libtnt/tnt_delete.h>
+#include <connector/c/include/tarantool/tnt_proto.h>
+#include <connector/c/include/tarantool/tnt_tuple.h>
+#include <connector/c/include/tarantool/tnt_reply.h>
+#include <connector/c/include/tarantool/tnt_stream.h>
+#include <connector/c/include/tarantool/tnt_delete.h>
 
 struct tnt_header_delete {
 	uint32_t ns;
diff --git a/connector/c/tnt/tnt_enc.c b/connector/c/tnt/tnt_enc.c
index 3821ef9b6900b670e1512bc2ba3617c143a41d74..b34993746ba7f900a7cb5ea34a864063e8b7cb6a 100644
--- a/connector/c/tnt/tnt_enc.c
+++ b/connector/c/tnt/tnt_enc.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_enc.h>
+#include <connector/c/include/tarantool/tnt_enc.h>
 
 int
 tnt_enc_read(char *buf, uint32_t *value)
diff --git a/connector/c/tnt/tnt_insert.c b/connector/c/tnt/tnt_insert.c
index 334dbc89a385eb96bc2f6e8543514f10bf8a08be..fc60becd60d38dc16ad92d07adea73a257dd86ba 100644
--- a/connector/c/tnt/tnt_insert.c
+++ b/connector/c/tnt/tnt_insert.c
@@ -28,11 +28,11 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_proto.h>
-#include <connector/c/include/libtnt/tnt_tuple.h>
-#include <connector/c/include/libtnt/tnt_reply.h>
-#include <connector/c/include/libtnt/tnt_stream.h>
-#include <connector/c/include/libtnt/tnt_insert.h>
+#include <connector/c/include/tarantool/tnt_proto.h>
+#include <connector/c/include/tarantool/tnt_tuple.h>
+#include <connector/c/include/tarantool/tnt_reply.h>
+#include <connector/c/include/tarantool/tnt_stream.h>
+#include <connector/c/include/tarantool/tnt_insert.h>
 
 struct tnt_header_insert {
 	uint32_t ns;
diff --git a/connector/c/tnt/tnt_iter.c b/connector/c/tnt/tnt_iter.c
index 653aa4a570afbf04d5fdac666314ba274a7347e9..6fd00584853e6d133020614166ed86689d120815 100644
--- a/connector/c/tnt/tnt_iter.c
+++ b/connector/c/tnt/tnt_iter.c
@@ -28,12 +28,12 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_mem.h>
-#include <connector/c/include/libtnt/tnt_enc.h>
-#include <connector/c/include/libtnt/tnt_tuple.h>
-#include <connector/c/include/libtnt/tnt_reply.h>
-#include <connector/c/include/libtnt/tnt_stream.h>
-#include <connector/c/include/libtnt/tnt_iter.h>
+#include <connector/c/include/tarantool/tnt_mem.h>
+#include <connector/c/include/tarantool/tnt_enc.h>
+#include <connector/c/include/tarantool/tnt_tuple.h>
+#include <connector/c/include/tarantool/tnt_reply.h>
+#include <connector/c/include/tarantool/tnt_stream.h>
+#include <connector/c/include/tarantool/tnt_iter.h>
 
 static struct tnt_iter *tnt_iter_tryalloc(struct tnt_iter *i) {
 	if (i) {
diff --git a/connector/c/tnt/tnt_mem.c b/connector/c/tnt/tnt_mem.c
index e257a7d604a7c08ac99fa27828029dae3a2cbc62..4a5e33f353bf32145e7497c6eefd3a07cd27bfc7 100644
--- a/connector/c/tnt/tnt_mem.c
+++ b/connector/c/tnt/tnt_mem.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_mem.h>
+#include <connector/c/include/tarantool/tnt_mem.h>
 
 static void *(*_tnt_realloc)(void *ptr, size_t size) =
 	(void *(*)(void*, size_t))realloc;
diff --git a/connector/c/tnt/tnt_ping.c b/connector/c/tnt/tnt_ping.c
index 63aa9c182911cd8c28d0a1d818c15c84f10f33b6..674c38a950c43b04c9edf642ca7c945a909139d4 100644
--- a/connector/c/tnt/tnt_ping.c
+++ b/connector/c/tnt/tnt_ping.c
@@ -28,11 +28,11 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_proto.h>
-#include <connector/c/include/libtnt/tnt_tuple.h>
-#include <connector/c/include/libtnt/tnt_reply.h>
-#include <connector/c/include/libtnt/tnt_stream.h>
-#include <connector/c/include/libtnt/tnt_ping.h>
+#include <connector/c/include/tarantool/tnt_proto.h>
+#include <connector/c/include/tarantool/tnt_tuple.h>
+#include <connector/c/include/tarantool/tnt_reply.h>
+#include <connector/c/include/tarantool/tnt_stream.h>
+#include <connector/c/include/tarantool/tnt_ping.h>
 
 /*
  * tnt_ping()
diff --git a/connector/c/tnt/tnt_reply.c b/connector/c/tnt/tnt_reply.c
index 4186252112cbae62214715469146b0f7ae75efc6..5e282621d0660e8fad8fdc49cff5c3bb34c24de2 100644
--- a/connector/c/tnt/tnt_reply.c
+++ b/connector/c/tnt/tnt_reply.c
@@ -28,10 +28,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_mem.h>
-#include <connector/c/include/libtnt/tnt_tuple.h>
-#include <connector/c/include/libtnt/tnt_proto.h>
-#include <connector/c/include/libtnt/tnt_reply.h>
+#include <connector/c/include/tarantool/tnt_mem.h>
+#include <connector/c/include/tarantool/tnt_tuple.h>
+#include <connector/c/include/tarantool/tnt_proto.h>
+#include <connector/c/include/tarantool/tnt_reply.h>
 
 /*
  * tnt_reply_init()
diff --git a/connector/c/tnt/tnt_select.c b/connector/c/tnt/tnt_select.c
index dde0104347414bf9e3b0d442d6c05db6e08e2eeb..30e0e63947ba14944f90a943bc3f5f58e30482d9 100644
--- a/connector/c/tnt/tnt_select.c
+++ b/connector/c/tnt/tnt_select.c
@@ -28,13 +28,13 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_mem.h>
-#include <connector/c/include/libtnt/tnt_proto.h>
-#include <connector/c/include/libtnt/tnt_tuple.h>
-#include <connector/c/include/libtnt/tnt_reply.h>
-#include <connector/c/include/libtnt/tnt_stream.h>
-#include <connector/c/include/libtnt/tnt_iter.h>
-#include <connector/c/include/libtnt/tnt_select.h>
+#include <connector/c/include/tarantool/tnt_mem.h>
+#include <connector/c/include/tarantool/tnt_proto.h>
+#include <connector/c/include/tarantool/tnt_tuple.h>
+#include <connector/c/include/tarantool/tnt_reply.h>
+#include <connector/c/include/tarantool/tnt_stream.h>
+#include <connector/c/include/tarantool/tnt_iter.h>
+#include <connector/c/include/tarantool/tnt_select.h>
 
 struct tnt_header_select {
 	uint32_t ns;
diff --git a/connector/c/tnt/tnt_stream.c b/connector/c/tnt/tnt_stream.c
index e43eaa2966c1e348f5710f8538ca825f03c1c947..076707886436094d1f3933598338880916421d3f 100644
--- a/connector/c/tnt/tnt_stream.c
+++ b/connector/c/tnt/tnt_stream.c
@@ -28,10 +28,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt_mem.h>
-#include <connector/c/include/libtnt/tnt_tuple.h>
-#include <connector/c/include/libtnt/tnt_reply.h>
-#include <connector/c/include/libtnt/tnt_stream.h>
+#include <connector/c/include/tarantool/tnt_mem.h>
+#include <connector/c/include/tarantool/tnt_tuple.h>
+#include <connector/c/include/tarantool/tnt_reply.h>
+#include <connector/c/include/tarantool/tnt_stream.h>
 
 /*
  * tnt_stream_reqid()
diff --git a/connector/c/tnt/tnt_tuple.c b/connector/c/tnt/tnt_tuple.c
index 18a5aad3455b7e1e41fa4ef5846e48321e9fbf9e..c55a2ab7a49c07cf8a973b0ad73118fa65f8c66c 100644
--- a/connector/c/tnt/tnt_tuple.c
+++ b/connector/c/tnt/tnt_tuple.c
@@ -30,9 +30,9 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <libtnt/tnt_mem.h>
-#include <libtnt/tnt_enc.h>
-#include <libtnt/tnt_tuple.h>
+#include <tarantool/tnt_mem.h>
+#include <tarantool/tnt_enc.h>
+#include <tarantool/tnt_tuple.h>
 
 /*
  * tnt_tuple_init()
diff --git a/connector/c/tnt/tnt_update.c b/connector/c/tnt/tnt_update.c
index e7de0f26cc6c66391475bae0f3233576588a6cd4..e796b776a9d9b6b77c815953d5e892097b29d010 100644
--- a/connector/c/tnt/tnt_update.c
+++ b/connector/c/tnt/tnt_update.c
@@ -28,14 +28,14 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <libtnt/tnt_mem.h>
-#include <libtnt/tnt_proto.h>
-#include <libtnt/tnt_enc.h>
-#include <libtnt/tnt_tuple.h>
-#include <libtnt/tnt_reply.h>
-#include <libtnt/tnt_stream.h>
-#include <libtnt/tnt_buf.h>
-#include <libtnt/tnt_update.h>
+#include <tarantool/tnt_mem.h>
+#include <tarantool/tnt_proto.h>
+#include <tarantool/tnt_enc.h>
+#include <tarantool/tnt_tuple.h>
+#include <tarantool/tnt_reply.h>
+#include <tarantool/tnt_stream.h>
+#include <tarantool/tnt_buf.h>
+#include <tarantool/tnt_update.h>
 
 static ssize_t
 tnt_update_op(struct tnt_stream *s,
diff --git a/connector/c/tntnet/CMakeLists.txt b/connector/c/tntnet/CMakeLists.txt
index 4a2bfe6e573bf1befab779faf3f4531d1ca79937..adb4e17a751f319681b7b0713cce37463423e194 100644
--- a/connector/c/tntnet/CMakeLists.txt
+++ b/connector/c/tntnet/CMakeLists.txt
@@ -40,20 +40,22 @@ string(REPLACE "-static" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 #
 # Static library
 #
-
 project(tntnet)
 add_library(tntnet STATIC ${tntnet_sources})
 set_target_properties(tntnet PROPERTIES COMPILE_FLAGS "${tntnet_cflags}")
+set_target_properties(tntnet PROPERTIES VERSION ${LIBTNT_VERSION} SOVERSION ${LIBTNT_SOVERSION})
+set_target_properties(tntnet PROPERTIES OUTPUT_NAME "tarantoolnet")
 
 #
 # Shared library
 #
-
 project(tntnet_shared)
 add_library(tntnet_shared SHARED ${tntnet_sources})
 target_link_libraries(tntnet_shared tnt_shared)
 set_target_properties(tntnet_shared PROPERTIES OUTPUT_NAME tntnet)
 set_target_properties(tntnet_shared PROPERTIES COMPILE_FLAGS "${tntnet_cflags}")
+set_target_properties(tntnet_shared PROPERTIES VERSION ${LIBTNT_VERSION} SOVERSION ${LIBTNT_SOVERSION})
+set_target_properties(tntnet_shared PROPERTIES OUTPUT_NAME "tarantoolnet")
 
 #----------------------------------------------------------------------------#
 # Install
diff --git a/connector/c/tntnet/tnt_io.c b/connector/c/tntnet/tnt_io.c
index f4c418b18850b44668245643744d63f2c54417ce..14166659089529ef260face67a211c53fdd77ede 100644
--- a/connector/c/tntnet/tnt_io.c
+++ b/connector/c/tntnet/tnt_io.c
@@ -41,9 +41,9 @@
 #include <errno.h>
 #include <limits.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_net.h>
-#include <connector/c/include/libtnt/tnt_io.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_net.h>
+#include <connector/c/include/tarantool/tnt_io.h>
 
 #if !defined(MIN)
 #	define MIN(a, b) (a) < (b) ? (a) : (b)
diff --git a/connector/c/tntnet/tnt_iob.c b/connector/c/tntnet/tnt_iob.c
index 579af945418985f179802fabd754af0076f5482b..4328a83447f6f3291544b2924f773d8a85468922 100644
--- a/connector/c/tntnet/tnt_iob.c
+++ b/connector/c/tntnet/tnt_iob.c
@@ -31,8 +31,8 @@
 #include <unistd.h>
 #include <sys/uio.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_iob.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_iob.h>
 
 int
 tnt_iob_init(struct tnt_iob *iob, size_t size,
diff --git a/connector/c/tntnet/tnt_net.c b/connector/c/tntnet/tnt_net.c
index b8e0261e1cb8e8ccd9a6a2bce6afa65de2c7f690..e4cf9b792e456ab35391d8dc6d69867b3c379d9a 100644
--- a/connector/c/tntnet/tnt_net.c
+++ b/connector/c/tntnet/tnt_net.c
@@ -29,9 +29,9 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_net.h>
-#include <connector/c/include/libtnt/tnt_io.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_net.h>
+#include <connector/c/include/tarantool/tnt_io.h>
 
 static struct tnt_stream *tnt_net_tryalloc(struct tnt_stream *s) {
 	if (s) {
diff --git a/connector/c/tntnet/tnt_opt.c b/connector/c/tntnet/tnt_opt.c
index ed305c743ff523013fd20c5d40df69a46a8c324b..3b5b9fe766763eddcef9107fa8867d9a25543c98 100644
--- a/connector/c/tntnet/tnt_opt.c
+++ b/connector/c/tntnet/tnt_opt.c
@@ -32,8 +32,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_net.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_net.h>
 
 void
 tnt_opt_init(struct tnt_opt *opt)
diff --git a/connector/c/tntsql/CMakeLists.txt b/connector/c/tntsql/CMakeLists.txt
index 9f8336527e07f0b7b592b5700e66c6cea9e74ed5..f88c3838d1fefc045b4bfd71b42e4a3aa372fd5e 100644
--- a/connector/c/tntsql/CMakeLists.txt
+++ b/connector/c/tntsql/CMakeLists.txt
@@ -43,6 +43,8 @@ string(REPLACE "-static" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 project(tntsql)
 add_library(tntsql STATIC ${tntsql_sources})
 set_target_properties(tntsql PROPERTIES COMPILE_FLAGS "${tntsql_cflags}")
+set_target_properties(tntsql PROPERTIES VERSION ${LIBTNT_VERSION} SOVERSION ${LIBTNT_SOVERSION})
+set_target_properties(tntsql PROPERTIES OUTPUT_NAME "tarantoolsql")
 
 #
 # Shared library
@@ -53,6 +55,8 @@ add_library(tntsql_shared SHARED ${tntsql_sources})
 target_link_libraries(tntsql_shared tnt_shared)
 set_target_properties(tntsql_shared PROPERTIES OUTPUT_NAME tntsql)
 set_target_properties(tntsql_shared PROPERTIES COMPILE_FLAGS "${tntsql_cflags}")
+set_target_properties(tntsql_shared PROPERTIES VERSION ${LIBTNT_VERSION} SOVERSION ${LIBTNT_SOVERSION})
+set_target_properties(tntsql_shared PROPERTIES OUTPUT_NAME "tarantoolsql")
 
 #----------------------------------------------------------------------------#
 # Install
diff --git a/connector/c/tntsql/tnt_lex.c b/connector/c/tntsql/tnt_lex.c
index 680414bc203da2227475f00ec1c1281e964f764a..5ad7b1b5c9e9e79050d867da752abd1d70dbfdf2 100644
--- a/connector/c/tntsql/tnt_lex.c
+++ b/connector/c/tntsql/tnt_lex.c
@@ -33,10 +33,10 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_utf8.h>
-#include <connector/c/include/libtnt/tnt_queue.h>
-#include <connector/c/include/libtnt/tnt_lex.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_utf8.h>
+#include <connector/c/include/tarantool/tnt_queue.h>
+#include <connector/c/include/tarantool/tnt_lex.h>
 
 bool tnt_lex_init(struct tnt_lex *l, unsigned char *buf, size_t size)
 {
diff --git a/connector/c/tntsql/tnt_sql.c b/connector/c/tntsql/tnt_sql.c
index 459efc5a3204b46458dedf5b82c80c7a18d05a50..b8b80c279a9cab8df03f1611e8f3994a0842d162 100644
--- a/connector/c/tntsql/tnt_sql.c
+++ b/connector/c/tntsql/tnt_sql.c
@@ -31,10 +31,10 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_queue.h>
-#include <connector/c/include/libtnt/tnt_utf8.h>
-#include <connector/c/include/libtnt/tnt_lex.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_queue.h>
+#include <connector/c/include/tarantool/tnt_utf8.h>
+#include <connector/c/include/tarantool/tnt_lex.h>
 
 /* sql parsing context. */
 
diff --git a/connector/c/tntsql/tnt_utf8.c b/connector/c/tntsql/tnt_utf8.c
index c522029c06755a74ee03d5b48e4f71d7a2ab3f4d..c3753775dc51657e121c89b3ade602cccdb4b9aa 100644
--- a/connector/c/tntsql/tnt_utf8.c
+++ b/connector/c/tntsql/tnt_utf8.c
@@ -30,8 +30,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_utf8.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_utf8.h>
 
 bool
 tnt_utf8_init(struct tnt_utf8 *u, unsigned char *data, size_t size)
diff --git a/debian/changelog b/debian/changelog
index 3ee8dc6dcc6cd653c1d59cffdcaa17047986cd4a..7e4f21686ab9d310b2e9e83a9c82af70a533d4fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tarantool (1.4.5+20120502-1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * Add Priority for sources.
+  * Add libtarantool* packages that weren't be packaged earlier: upstream
+    renamed them, now we have no conflicts with the other debian packages.
+  * Add libncurses5-dev into Build-Depends.
+
+ -- Dmitry E. Oboukhov <unera@debian.org>  Thu, 03 May 2012 00:08:38 +0400
+
 tarantool (1.4.4+20120127-1) unstable; urgency=low
 
   * Merge with upstream.
diff --git a/debian/control b/debian/control
index 214b595f66d17cd9ae1a5b5d2980467459406730..166f074cfb6cd929f4fba94b1e231d2ddc964f3c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,5 @@
 Source: tarantool
+Priority: optional
 Maintainer: Dmitry E. Oboukhov <unera@debian.org>
 Build-Depends: cdbs, debhelper (>= 8),
  gobjc,
@@ -6,7 +7,8 @@ Build-Depends: cdbs, debhelper (>= 8),
  libreadline-dev,
  python-yaml,
  python-daemon,
- python-pexpect
+ python-pexpect,
+ libncurses5-dev
 Section: database
 Standards-Version: 3.9.2
 Homepage: http://tarantool.org/
@@ -68,12 +70,131 @@ Description: high performance key/value storage server
   * available on Linux and FreeBSD
   * stored procedures in Lua are supported
  .
- This package provides debug symbols for all tarantool packages.
+ This package provides debug symbols for tarantool.
+
+Package: tarantool-client
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libmr-tarantool-perl
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package provides readline client for tarantool.
+
+Package: tarantool-client-dbg
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, ${misc:Depends},
+     tarantool-client (= ${binary:Version})
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package provides readline client for tarantool (debug symbols).
+
+Package: libtarantool1
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package provides c-connector library for tarantool.
+
+Package: libtarantool1-dbg
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, ${misc:Depends},
+     libtarantool1 (= ${binary:Version})
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package provides debug symbols for libtarantool1.
 
-Package: tarantool-connector-c
+Package: libtarantool-dev
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Priority: optional
-Depends: ${shlibs:Depends}
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libtarantool1 (= ${binary:Version}),
+ libtarantoolsql1 (= ${binary:Version}),
+ libtarantoolnet1 (= ${binary:Version})
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package provides headers for libtarantool* libraries.
+
+Package: libtarantoolnet1
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package provides c-connector library for tarantool (network).
+
+Package: libtarantoolnet1-dbg
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, ${misc:Depends},
+     libtarantoolnet1 (= ${binary:Version})
 Description: high performance key/value storage server
  Tarantool is an open-source NoSQL database, developed by Mail.ru.
  Its key properties include:
@@ -86,4 +207,43 @@ Description: high performance key/value storage server
   * available on Linux and FreeBSD
   * stored procedures in Lua are supported
  .
- This package provides tarantool C client libraries.
+ This package provides debug symbols for libtarantoolnet1.
+
+Package: libtarantoolsql1
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package provides SQL-parser for tarantool.
+
+Package: libtarantoolsql1-dbg
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, ${misc:Depends},
+     libtarantoolsql1 (= ${binary:Version})
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package provides debug symbols for libtarantoolsql1.
+
diff --git a/debian/libtarantool-dev.install b/debian/libtarantool-dev.install
new file mode 100644
index 0000000000000000000000000000000000000000..20276062a4b2db88849a5ee90efaa9b588b2e13c
--- /dev/null
+++ b/debian/libtarantool-dev.install
@@ -0,0 +1,8 @@
+build-area/connector/c/tnt/*.so             /usr/lib/
+build-area/connector/c/tnt/*.a              /usr/lib/
+build-area/connector/c/tntnet/*.so          /usr/lib/
+build-area/connector/c/tntnet/*.a           /usr/lib/
+build-area/connector/c/tntsql/*.so          /usr/lib/
+build-area/connector/c/tntsql/*.a           /usr/lib/
+connector/c/include/tarantool/*             /usr/include/tarantool/
+
diff --git a/debian/libtarantool1.install b/debian/libtarantool1.install
new file mode 100644
index 0000000000000000000000000000000000000000..05946c9e73256160e434d2193c4c68e0c75f26dc
--- /dev/null
+++ b/debian/libtarantool1.install
@@ -0,0 +1,2 @@
+build-area/connector/c/tnt/libtarantool.so.1.1  /usr/lib/
+build-area/connector/c/tnt/libtarantool.so.1    /usr/lib/
diff --git a/debian/libtarantoolnet1.install b/debian/libtarantoolnet1.install
new file mode 100644
index 0000000000000000000000000000000000000000..9a0a7db22af7e54fc0afe1f7ff7103fd03af8142
--- /dev/null
+++ b/debian/libtarantoolnet1.install
@@ -0,0 +1,2 @@
+build-area/connector/c/tntnet/libtarantoolnet.so.1.1  /usr/lib/
+build-area/connector/c/tntnet/libtarantoolnet.so.1    /usr/lib/
diff --git a/debian/libtarantoolsql1.install b/debian/libtarantoolsql1.install
new file mode 100644
index 0000000000000000000000000000000000000000..43329b1c83cfed47e57cc151fb9e7186955a9461
--- /dev/null
+++ b/debian/libtarantoolsql1.install
@@ -0,0 +1,3 @@
+build-area/connector/c/tntsql/libtarantoolsql.so.1.1  /usr/lib/
+build-area/connector/c/tntsql/libtarantoolsql.so.1    /usr/lib/
+
diff --git a/debian/rules b/debian/rules
index 46b11a4569e70fa35f1a36a893dfe8670262bb94..599aa945510a087801fcb0ec3e8c8170429f1d7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,8 @@ DEB_CMAKE_NORMAL_ARGS := -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_SYSCONF_DIR=/etc/tarantool \
-    -DCMAKE_LOCALSTATE_DIR=/var \
-    -DENABLE_STATIC=ON
+    -DCMAKE_LOCALSTATE_DIR=/var
+#     -DENABLE_STATIC=ON
 #    -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \
 #    -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \
 
@@ -41,13 +41,12 @@ install/tarantool-dbg::
 install/tarantool::
 #         make -C build-area test-force || /bin/true
 
-install/tarantool-connector-c::
-#
 
 install/tarantool-common::
 	pod2man -c 'tarantool instances control' \
 	    debian/tarantool_instance.pod > build-area/tarantool_instance.1
 	pod2man -c 'tarantool log rotation' \
-	    debian/tarantool_logrotate.pod > build-area/tarantool_logrotate.1
+	    debian/scripts/tarantool_logrotate \
+	    	 > build-area/tarantool_logrotate.1
 	install -m0755 extra/logger.pl \
 	    debian/tarantool-common/usr/lib/tarantool/logger
diff --git a/debian/scripts/tarantool_instance b/debian/scripts/tarantool_instance
index e97f9c6ad6c90b63d71d74585b90e6539843b543..7adc8d991eeb27e5bd3d96700ef8c8b97ee2d481 100755
--- a/debian/scripts/tarantool_instance
+++ b/debian/scripts/tarantool_instance
@@ -16,6 +16,10 @@ cd $CFG_DIR
 
 usage="Usage: sh $0 /path/to/config.file start|stop"
 
+if ! test -x $BOX; then
+    exit 0
+fi
+
 if test -z "$CFG"; then
     echo $usage
     exit 5
@@ -57,8 +61,11 @@ LOGGER="exec /usr/lib/tarantool/logger $LOG"
 SOCKETS=`grep \
     '^[[:space:]]*file_descriptors[[:space:]]*=[[:space:]]*[[:digit:]]\+' $CFG \
     | tail -n 1 \
-    | sed 's/[^[:digit:]]//g'
-`
+    | sed 's/[^[:digit:]]//g'`
+
+if ! test -x $PID_DIR; then
+    install -otarantool -gtarantool -d -m0750 $PID_DIR
+fi
 
 SSDARGS_NO_PID="--quiet --chdir $RUNDIR --chuid tarantool --exec"
 SSDARGS="--pidfile $PID $SSDARGS_NO_PID"
@@ -74,6 +81,8 @@ sed "s/^[[:space:]]*file_descriptors.*/# & $comment_str/" $CFG > $SCFG
 
 echo "pid_file = $PID"        >> $SCFG
 echo "logger   = \"$LOGGER\"" >> $SCFG
+grep '^[[:space:]]*admin_port[[:space:]]*=' $CFG |tail -n 1 >> $SCFG
+grep '^[[:space:]]*primary_port[[:space:]]*=' $CFG |tail -n 1 >> $SCFG
 
 $BOX -c $SCFG -v --check-config
 
diff --git a/debian/scripts/tarantool_logrotate b/debian/scripts/tarantool_logrotate
index da2896c0ef3793df62913d1eb6792ab717058aa2..94c27e13b12ded254c3d00b5bd11d0d8ad9059d9 100755
--- a/debian/scripts/tarantool_logrotate
+++ b/debian/scripts/tarantool_logrotate
@@ -1,48 +1,88 @@
-#!/bin/sh
+#!/usr/bin/perl
 
-set -e
+use warnings;
+use strict;
+
+use constant CONFIG_DIR => '/var/lib/tarantool/started';
+use constant PID_DIR    => '/var/run/tarantool';
+use File::Spec::Functions 'catfile';
+use File::Basename 'basename', 'dirname';
+use IO::Socket::INET;
+
+exit 0 unless -x PID_DIR;
+exit 0 unless -x CONFIG_DIR;
+
+for (glob catfile PID_DIR, '*.pid') {
+    my $cfg = catfile CONFIG_DIR, basename $_, '.pid';
+
+    unless(-r $cfg) {
+        warn "Config file '$cfg' is not found\n";
+        next;
+    }
+
+    my $admin_port;
+
+    if (open my $fh, '<', $cfg) {
+        my @cfg = <$fh>;
+        ($admin_port) = grep /^\s*admin_port\s*=\s*\d+\s*$/, reverse @cfg;
+    } else {
+        warn "$!\n";
+        next;
+    }
+
+    unless($admin_port) {
+        warn "admin_port is not found in $cfg\n";
+        next;
+    }
+
+    $admin_port =~ s/\D+//g;
+
+    my $socket = IO::Socket::INET->new(PeerAddr => "localhost:$admin_port");
+    unless($socket) {
+        warn "Can't connect to localhost:$admin_port: $!";
+        next;
+    }
 
-CLI="/usr/bin/tarantool"
-CONFIG_DIR="/var/lib/tarantool/started"
-PID_DIR="/var/run/tarantool"
-PROMPT=`basename $0`
 
-error() {
-	echo "$PROMPT error: $*" 1>&2
-	exit 1
-}
 
-logger_notify() {
-	CFG=$1
-	PORT_PRIMARY=`grep \
-	  '^[[:space:]]*primary_port[[:space:]]*=[[:space:]]*[[:digit:]]\+' $CFG \
-	  | tail -n 1 \
-	  | sed 's/[^[:digit:]]//g'
-	`
-	[ $? -eq 0 ] || error "failed to get primary port"
-	PORT_ADMIN=`grep \
-	  '^[[:space:]]*admin_port[[:space:]]*=[[:space:]]*[[:digit:]]\+' $CFG \
-	  | tail -n 1 \
-	  | sed 's/[^[:digit:]]//g'
-	`
-	[ $? -eq 0 ] || error "failed to get admin port"
-	LOGGER_PID=`${CLI} -p $PORT_PRIMARY -m $PORT_ADMIN "show info" \
-	  | grep 'logger_pid:' \
-	  | sed 's/[^[:digit:]]//g'
-	`
-	[ $? -eq 0 ] || error "failed to get logger pid"
-	kill -HUP $LOGGER_PID
+    my $logger_pid;
+    local $SIG{ALRM} = sub { die "alarm\n" };
+    alarm 3;
+
+    eval {
+        print $socket "show info\n";
+        while(<$socket>) {
+            next unless /^\s*logger_pid:\s*(\d+)\s*$/;
+            $logger_pid = $1;
+            last;
+        }
+    };
+
+    alarm 0;
+
+    unless($logger_pid) {
+        warn "Can't define logger_pid\n";
+        next;
+    }
+
+    unless(kill 'HUP' => $logger_pid) {
+        warn "Can't send HUP to pid=$logger_pid: $!";
+        next;
+    }
 }
 
-if ! echo $1|grep -q '^\(start\)$'; then
-	echo "Tarantool log rotation script"
-	echo "Usage: $0 <start>"
-    exit 5
-fi
-
-if test -d ${PID_DIR}; then
-	for file in `ls -1 $PID_DIR`; do
-		INSTANCE=`basename $file .pid`
-		logger_notify "$CONFIG_DIR/$INSTANCE"
-	done
-fi
+=head1 NAME
+
+/usr/lib/tarantool/tarantool_logrotate - utility to rotate
+tarantool instances logs
+
+
+=head1 SINOPSYS
+
+    tarantool_logrotate
+
+=head1 DESCRIPTION
+
+The utility tries to connect to each running tarantool instance to get
+logger pid file, then it sends B<SIGHUP> to logger which initiates
+log rotataion procedure.
diff --git a/debian/tarantool-client.install b/debian/tarantool-client.install
new file mode 100644
index 0000000000000000000000000000000000000000..11adc51c83562c4f7494e39fcc33ee9373ab8154
--- /dev/null
+++ b/debian/tarantool-client.install
@@ -0,0 +1 @@
+usr/bin/tarantool
diff --git a/debian/tarantool-client.manpages b/debian/tarantool-client.manpages
new file mode 100644
index 0000000000000000000000000000000000000000..5055008511222ae5d9939a0d49d19b0cb1093661
--- /dev/null
+++ b/debian/tarantool-client.manpages
@@ -0,0 +1 @@
+build-area/doc/man/tarantool.1
diff --git a/debian/tarantool-common.install b/debian/tarantool-common.install
index da80b29de556d199defc74eb109bd7e8e44ad293..710b54af12438e0b370b8737d87cfc87d5d5d9a0 100644
--- a/debian/tarantool-common.install
+++ b/debian/tarantool-common.install
@@ -1,3 +1,3 @@
 debian/etc/example.cfg /etc/tarantool/instances.available/
 debian/scripts/tarantool_instance /usr/sbin
-debian/scripts/tarantool_logrotate /usr/sbin
+debian/scripts/tarantool_logrotate /usr/lib/tarantool/
diff --git a/debian/tarantool-common.logrotate b/debian/tarantool-common.logrotate
index 1dc3e9b24e2142245b1820ea090e6553f0e92d5d..caf08ae97abec9c5d3db7be87f1a204f1a7bbe69 100644
--- a/debian/tarantool-common.logrotate
+++ b/debian/tarantool-common.logrotate
@@ -7,6 +7,6 @@
     delaycompress
     create 0640 tarantool adm
     postrotate
-        /usr/sbin/tarantool_logrotate start
+        /usr/lib/tarantool/tarantool_logrotate
     endscript
 }
diff --git a/debian/tarantool-common.manpages b/debian/tarantool-common.manpages
index 5f67776ab9bc87862c15076efeb09ef350535ecf..dedf40b3c40948184572d659c2fc22f446e9e096 100644
--- a/debian/tarantool-common.manpages
+++ b/debian/tarantool-common.manpages
@@ -1,4 +1,2 @@
-build-area/doc/man/tarantool.1
-build-area/doc/man/tarantool_box.1
 build-area/tarantool_instance.1
 build-area/tarantool_logrotate.1
diff --git a/debian/tarantool.install b/debian/tarantool.install
index 8e3fa42212a9c9665356b481ceb8ce33337e80a7..6c89b00b9309dc91e947adda24fb3a7b0e39451e 100644
--- a/debian/tarantool.install
+++ b/debian/tarantool.install
@@ -1,2 +1 @@
 usr/bin/tarantool_box
-usr/bin/tarantool
diff --git a/debian/tarantool.manpages b/debian/tarantool.manpages
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0610c2eb17f233c2e11904c6d97936b6b3bf206c 100644
--- a/debian/tarantool.manpages
+++ b/debian/tarantool.manpages
@@ -0,0 +1,2 @@
+build-area/doc/man/tarantool_box.1
+
diff --git a/debian/tarantool_logrotate.pod b/debian/tarantool_logrotate.pod
deleted file mode 100644
index 1248621bb9d9dede25a23f99669397307e05025f..0000000000000000000000000000000000000000
--- a/debian/tarantool_logrotate.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-=head1 NAME
-
-tarantool_logrotate - utility to rotate tarantool instances logs
-
-
-=head1 SINOPSYS
-
-    tarantool_logrotate
-
-
-=head1 DESCRIPTION
-
-The utility tries to connect to each running tarantool instance to get
-logger pid file, then it sends SIGUSR2 to logger which initiates
-log rotataion procedure.
diff --git a/test/box/protocol.c b/test/box/protocol.c
index 58b14abe9f96a65ede41b933e4f1e1d5f43d5aca..c22bbfdab1b1444720997d0ecd2d1cdf08bd1078 100644
--- a/test/box/protocol.c
+++ b/test/box/protocol.c
@@ -6,9 +6,9 @@
 #include "util.h"
 #include "errcode.h"
 
-#include <libtnt/tnt.h>
-#include <libtnt/tnt_net.h>
-#include <libtnt/tnt_io.h>
+#include <tarantool/tnt.h>
+#include <tarantool/tnt_net.h>
+#include <tarantool/tnt_io.h>
 
 /** Client handler. Reused between tests. */
 struct tnt_stream *t;
diff --git a/test/connector_c/tt.c b/test/connector_c/tt.c
index da80546be0b98a572bdb907296bccc4ea0cbdf18..50e1c6c3575f7565512bae5923a39daaa7f72c3a 100644
--- a/test/connector_c/tt.c
+++ b/test/connector_c/tt.c
@@ -30,13 +30,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_net.h>
-#include <connector/c/include/libtnt/tnt_io.h>
-#include <connector/c/include/libtnt/tnt_queue.h>
-#include <connector/c/include/libtnt/tnt_utf8.h>
-#include <connector/c/include/libtnt/tnt_lex.h>
-#include <connector/c/include/libtnt/tnt_sql.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_net.h>
+#include <connector/c/include/tarantool/tnt_io.h>
+#include <connector/c/include/tarantool/tnt_queue.h>
+#include <connector/c/include/tarantool/tnt_utf8.h>
+#include <connector/c/include/tarantool/tnt_lex.h>
+#include <connector/c/include/tarantool/tnt_sql.h>
 
 struct tt_test;
 
diff --git a/test/connector_c/update.c b/test/connector_c/update.c
index c07db58b5a86897cad038b773e789fbf9c3a5e42..cbeaa002566fea20dcdb8727360b7e06dc8c9d72 100644
--- a/test/connector_c/update.c
+++ b/test/connector_c/update.c
@@ -30,9 +30,9 @@
 #include <string.h>
 #include <limits.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_net.h>
-#include <connector/c/include/libtnt/tnt_io.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_net.h>
+#include <connector/c/include/tarantool/tnt_io.h>
 
 #include <util.h>
 #include <errcode.h>