diff --git a/.gitignore b/.gitignore
index 0ddc43202ba4e1f47b84f813893db5b18c0cc10e..f08894b87ddc9142024c6727ccccd11f8fd3155f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,12 +103,14 @@ debian/tarantool-common.postinst.debhelper
 debian/tarantool-common.postrm.debhelper
 debian/tarantool-common.prerm.debhelper
 debian/tarantool-common.substvars
+debian/tarantool-common.manpages
 debian/tarantool-common/*
 debian/tarantool-dev.debhelper.log
 debian/tarantool-dev.substvars
 debian/tarantool-dev/*
 debian/tarantool.debhelper.log
 debian/tarantool.substvars
+debian/tarantool.manpages
 debian/tarantool/*
 debian/tmp/*
 *.cdbs-config_list
diff --git a/debian/rules b/debian/rules
index 0ddc75e344056072402e07f653f6bc427a4575a6..c6a0bf0237acdb8dc2ded9996608084f12fe9a84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,27 +5,15 @@ VERSION  := $(shell dpkg-parsechangelog|grep ^Version|awk '{print $$2}')
 UVERSION := $(shell echo $(VERSION)|sed 's/-[[:digit:]]\+$$//')
 
 DEB_CMAKE_EXTRA_FLAGS := \
-	-DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-DEB_DH_INSTALLINIT_ARGS := --name=tarantool
-
-DEB_CMAKE_INSTALL_PREFIX := /usr
-DEB_CMAKE_NORMAL_ARGS := -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \
-	-DCMAKE_SKIP_RPATH=ON \
-	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
 	-DCMAKE_INSTALL_SYSCONFDIR=/etc \
 	-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 	-DENABLE_BUNDLED_LIBYAML=OFF \
 	-DENABLE_DIST=ON
-#     -DCMAKE_C_FLAGS="$(CFLAGS)" \
-#     -DCMAKE_LD_FLAGS="$(LDFLAGS)" \
-#     -DENABLE_STATIC=ON
-#     -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
-#     -DCMAKE_CPP_FLAGS="$(CPPFLAGS)" \
-#    -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \
-#    -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \
-
-DEB_INSTALL_DOCS_ALL 		:= -XTODO -XAUTHORS
+
+DEB_DH_INSTALLINIT_ARGS := --name=tarantool
+
 # Needed for proper backtraces in fiber.info()
 DEB_DH_STRIP_ARGS	        := -X/usr/bin/tarantool
 export DEB_BUILD_MAINT_OPTIONS = hardening=-stackprotector,-pie
@@ -35,7 +23,10 @@ include /usr/share/dpkg/buildflags.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 
-DEB_BUILDDIR := build-area
+debian/%.manpages: debian/%.manpages.in
+	sed 's/@DEB_BUILDDIR@/$(DEB_BUILDDIR)/g' $< > $@
+
+build-indep: debian/tarantool.manpages debian/tarantool-common.manpages
 
 tarball: clean
 	git describe --long --always > VERSION
diff --git a/debian/tarantool-common.manpages b/debian/tarantool-common.manpages
deleted file mode 100644
index 6198544dcb4a7a1a2cfb0ffc6c788c0bbf6e0635..0000000000000000000000000000000000000000
--- a/debian/tarantool-common.manpages
+++ /dev/null
@@ -1 +0,0 @@
-build-area/extra/dist/tarantoolctl.1
diff --git a/debian/tarantool-common.manpages.in b/debian/tarantool-common.manpages.in
new file mode 100644
index 0000000000000000000000000000000000000000..86a78e43b6a61df6155364d99b744ff59c8de1d0
--- /dev/null
+++ b/debian/tarantool-common.manpages.in
@@ -0,0 +1 @@
+@DEB_BUILDDIR@/extra/dist/tarantoolctl.1
diff --git a/debian/tarantool.docs b/debian/tarantool.docs
new file mode 100644
index 0000000000000000000000000000000000000000..5faa2f278d809409a38339a7d76e65976b73713f
--- /dev/null
+++ b/debian/tarantool.docs
@@ -0,0 +1,2 @@
+README.md
+AUTHORS
diff --git a/debian/tarantool.lintian-overrides b/debian/tarantool.lintian-overrides
index 67d2005c096b6ec202b10db73b9def47293fbf66..79de2b236e53ae6dff1c40a7d0a33221e1a1fd18 100644
--- a/debian/tarantool.lintian-overrides
+++ b/debian/tarantool.lintian-overrides
@@ -1,2 +1 @@
 tarantool: unstripped-binary-or-object usr/bin/tarantool
-tarantool: embedded-library usr/bin/tarantool: libyaml
diff --git a/debian/tarantool.manpages b/debian/tarantool.manpages
deleted file mode 100644
index 45539f00cdaf84dfae8ab0b0ce5601e53ef13883..0000000000000000000000000000000000000000
--- a/debian/tarantool.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-build-area/doc/man/tarantool.1
-
diff --git a/debian/tarantool.manpages.in b/debian/tarantool.manpages.in
new file mode 100644
index 0000000000000000000000000000000000000000..dac0f61b9e9f66a6b7c8a91551083f24dfdb6bbe
--- /dev/null
+++ b/debian/tarantool.manpages.in
@@ -0,0 +1 @@
+@DEB_BUILDDIR@/doc/man/tarantool.1