diff --git a/CMakeLists.txt b/CMakeLists.txt
index e72e8748e07822e3721becee39041186fc7b834f..60396df51772f4640112337ab1e0e28754c0716f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,17 +146,24 @@ include_directories(${PROJECT_SOURCE_DIR})
 #
 # Specify Tarantool modules prefixes
 #
-set(MODULE_SUFFIX "tarantool/${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-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}")
-message(STATUS "Module sources: ${MODULE_LUADIR}")
-message(STATUS "Module libraries:${MODULE_LIBDIR}")
-message(STATUS "Module includes: ${MODULE_INCLUDEDIR}")
-
-list(APPEND MODULE_LUAPATH "${MODULE_LUADIR}/?.lua")
-list(APPEND MODULE_LUAPATH "${MODULE_LUADIR}/?/init.lua")
-list(APPEND MODULE_LIBPATH "${MODULE_LIBDIR}/?${CMAKE_SHARED_MODULE_SUFFIX}")
+
+set(MODULE_SUFFIX "tarantool")
+set(MODULE_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${MODULE_SUFFIX}")
+set(MODULE_LUADIR "${CMAKE_INSTALL_DATADIR}/${MODULE_SUFFIX}")
+set(MODULE_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/${MODULE_SUFFIX}")
+
+set(MODULE_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${MODULE_LIBDIR}")
+set(MODULE_FULL_LUADIR "${CMAKE_INSTALL_PREFIX}/${MODULE_LUADIR}")
+set(MODULE_FULL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${MODULE_INCLUDEDIR}")
+
+message(STATUS "Module sources: ${MODULE_FULL_LUADIR}")
+message(STATUS "Module libraries:${MODULE_FULL_LIBDIR}")
+message(STATUS "Module includes: ${MODULE_FULL_INCLUDEDIR}")
+
+list(APPEND MODULE_LUAPATH "${MODULE_FULL_LUADIR}/?.lua")
+list(APPEND MODULE_LUAPATH "${MODULE_FULL_LUADIR}/?/init.lua")
+list(APPEND MODULE_LIBPATH "${MODULE_FULL_LIBDIR}/?${CMAKE_SHARED_MODULE_SUFFIX}")
+
 message(STATUS "Module package.path: ${MODULE_LUAPATH}")
 message(STATUS "Module package.cpath: ${MODULE_LIBPATH}")
 
diff --git a/debian/rules b/debian/rules
index 33c1c83d5823358bc63d81667dc926a8280e07fc..5e8c510daea2b8e99a197e1ca1aa3ca1227ce147 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,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
 DEB_INSTALL_DOCS_ALL 		:= -XTODO -XAUTHORS
 DEB_DH_STRIP_ARGS_tarantool	:= -X/usr/bin/tarantool
 
diff --git a/debian/tarantool-modules.install b/debian/tarantool-modules.install
index 9cd0ac1fb0d1b849f3a964aa61181c9645a49709..10d9d4ab21ee4e9b9f46d7681bf5b77676c18132 100644
--- a/debian/tarantool-modules.install
+++ b/debian/tarantool-modules.install
@@ -1,2 +1,2 @@
-usr/share/tarantool/1.6/box/net/sql.lua
-usr/lib/tarantool/1.6/box/sophia.so
+usr/share/tarantool/box/net/sql.lua
+usr/lib/tarantool/box/sophia.so
diff --git a/debian/tarantool-mysql-module.install b/debian/tarantool-mysql-module.install
index 9e715df39ba271c48ea4f34de5c76b40067fdef2..ce433b67647c5fb226cc5aec261463c508a574ad 100644
--- a/debian/tarantool-mysql-module.install
+++ b/debian/tarantool-mysql-module.install
@@ -1,2 +1 @@
-usr/lib/tarantool/1.6/box/net/mysql.so
-
+usr/lib/tarantool/box/net/mysql.so
diff --git a/debian/tarantool-postgresql-module.install b/debian/tarantool-postgresql-module.install
index 253c7ec7ec08d673e8d9f968f7b407eaefdeab13..e8ad91381a15b87fcf928a6aa57423d9df2d6d4e 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/box/net/pg.so
diff --git a/src/trivia/config.h.cmake b/src/trivia/config.h.cmake
index 2ccdec90907242808665cc564ee2e8e404f10497..04fa7fe30ffcf5cdd9058c924d390ad4bcd008c6 100644
--- a/src/trivia/config.h.cmake
+++ b/src/trivia/config.h.cmake
@@ -147,9 +147,9 @@
 /*
  * Modules
  */
-#define MODULE_LIBDIR "@MODULE_LIBDIR@"
-#define MODULE_LUADIR "@MODULE_LUADIR@"
-#define MODULE_INCLUDEDIR "@MODULE_INCLUDEDIR@"
+#define MODULE_LIBDIR "@MODULE_FULL_LIBDIR@"
+#define MODULE_LUADIR "@MODULE_FULL_LUADIR@"
+#define MODULE_INCLUDEDIR "@MODULE_FULL_INCLUDEDIR@"
 #define MODULE_LUAPATH "@MODULE_LUAPATH@"
 #define MODULE_LIBPATH "@MODULE_LIBPATH@"