diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc491b8547a6b8400843ebafc1bca9ab2663dd60..659f610e7fc09533503f317f2cf60a80b05c1f05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,8 +152,9 @@ include_directories("${PROJECT_SOURCE_DIR}")
 #
 # Specify Tarantool modules prefixes
 #
-
+if (NOT MODULE_SUFFIX)
 set(MODULE_SUFFIX "tarantool/${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
+endif()
 set(MODULE_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${MODULE_SUFFIX}")
 set(MODULE_LUADIR "${CMAKE_INSTALL_FULL_DATADIR}/${MODULE_SUFFIX}")
 set(MODULE_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/${MODULE_SUFFIX}")
diff --git a/debian/rules b/debian/rules
index 0d9a88341388e386de7982a7b5e2ecb9f60a08bc..0f024028f74844e23f7c232ef02bca28c6b7be3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,10 @@ UVERSION := $(shell echo $(VERSION)|sed 's/-[[:digit:]]\+$$//')
 
 DEB_CMAKE_EXTRA_FLAGS := \
 	-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-	-DENABLE_CLIENT=true \
 	-DWITH_MYSQL=ON \
+	-DMODULE_SUFFIX=tarantool/lua \
 	-DWITH_POSTGRESQL=ON
+#         -DENABLE_CLIENT=true \
 
 DEB_DH_INSTALLINIT_ARGS := --name=tarantool
 
@@ -29,7 +30,7 @@ DEB_CMAKE_NORMAL_ARGS := -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \
 #    -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \
 #    -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \
 
-DEB_SHLIBDEPS_INCLUDE          := /usr/lib/tarantool/1.6
+DEB_SHLIBDEPS_INCLUDE          := /usr/lib/tarantool/lua
 DEB_INSTALL_DOCS_ALL 		:= -XTODO -XAUTHORS
 DEB_DH_STRIP_ARGS_tarantool	:= -X/usr/bin/tarantool
 
diff --git a/debian/tarantool-common.install b/debian/tarantool-common.install
index affb73c50f62b85a49a3c98afeb1482e936d4600..6a7125a1563aa88065583f42bf5e948e0f387c0c 100644
--- a/debian/tarantool-common.install
+++ b/debian/tarantool-common.install
@@ -1,4 +1,3 @@
-debian/etc/example.cfg /etc/tarantool/instances.available/
 debian/scripts/tarantool_instance /usr/sbin/
 debian/scripts/tarantool_snapshot_rotate /usr/sbin/
 debian/scripts/tarantool_logrotate /usr/lib/tarantool/
diff --git a/debian/tarantool-modules.install b/debian/tarantool-modules.install
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e969e64582ff6aba76f2fa9dffae12b8406bba85 100644
--- a/debian/tarantool-modules.install
+++ b/debian/tarantool-modules.install
@@ -0,0 +1,2 @@
+usr/share/tarantool/lua/box/net/sql.lua
+usr/lib/tarantool/lua/box/sophia.so
diff --git a/debian/tarantool-mysql-module.install b/debian/tarantool-mysql-module.install
index 9e715df39ba271c48ea4f34de5c76b40067fdef2..85584944ecb203690062cbefe2dd89d32d2eecaf 100644
--- a/debian/tarantool-mysql-module.install
+++ b/debian/tarantool-mysql-module.install
@@ -1,2 +1,2 @@
-usr/lib/tarantool/1.6/box/net/mysql.so
+usr/lib/tarantool/lua/box/net/mysql.so
 
diff --git a/debian/tarantool-postgresql-module.install b/debian/tarantool-postgresql-module.install
index 253c7ec7ec08d673e8d9f968f7b407eaefdeab13..8bd9fe8fecaf9b2bb29e8f06ffe66ba3a31493fd 100644
--- a/debian/tarantool-postgresql-module.install
+++ b/debian/tarantool-postgresql-module.install
@@ -1 +1 @@
-usr/lib/tarantool/1.6/box/net/pg.so
+usr/lib/tarantool/lua/box/net/pg.so
diff --git a/debian/tarantool.install b/debian/tarantool.install
index cf3778fde0d0496cc81cc52f63cb4eda921a47ab..5fd1f747a7383604c0ed904313b7eb1d9917da99 100644
--- a/debian/tarantool.install
+++ b/debian/tarantool.install
@@ -1,2 +1,2 @@
 usr/bin/tarantool
-#usr/bin/tarantar
+usr/share/doc/tarantool/box-protocol.txt