diff --git a/debian/changelog b/debian/changelog
index 5fb7821e9a9bbc83bd9535f2704921efe03212db..1acbd0337b96aad15b6c4c0eb4dd196916a04a0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tarantool (1.6.3.183.gd309992-1) UNRELEASED; urgency=medium
+
+  * Init infrastructure for tarantool 1.6.
+
+ -- Dmitry E. Oboukhov <unera@debian.org>  Wed, 20 Aug 2014 17:19:14 +0400
+
 tarantool (1.5.3.53.ge2308d8-1) unstable; urgency=medium
 
   * New Debian snapshot
diff --git a/debian/control b/debian/control
index 596a94722777c76d0988573bfc2bee0b02be5f4e..c54bb43cb8fb2355f1167b3300ef5544458bd119 100644
--- a/debian/control
+++ b/debian/control
@@ -14,30 +14,29 @@ Homepage: http://tarantool.org/
 VCS-Browser: https://github.com/tarantool/tarantool
 VCS-Git: git://github.com/tarantool/tarantool.git
 
-# Package: tarantool-common
-# Architecture: all
-# Priority: optional
-# Depends: ${misc:Depends}, adduser
-# Description: Tarantool in-memory database - common files
-#  Tarantool is an in-memory database and Lua application server.
-#  This package provides scripts to work with tarantool configuration
-#  and log files.
+Package: tarantool-common
+Architecture: all
+Priority: optional
+Depends: ${misc:Depends}, adduser
+Description: Tarantool in-memory database - common files
+ Tarantool is an in-memory database and Lua application server.
+ This package provides scripts to work with tarantool configuration
+ and log files.
 
 Package: tarantool
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: tarantool-dbg (<< 1.5.2),
-#  tarantool-common (<< 1.6~),
+ tarantool-common (<< 1.6~),
  tarantool-client (<< 1.6~),
  tarantool-client-dbg (<< 1.6~),
  tarantool-plugins (<< 1.6~),
  tarantool-mysql-plugin (<< 1.6~),
  tarantool-postgresql-plugin (<< 1.6~),
  libtarantool-dev (<< 1.6~)
-# Recommends: tarantool-common (>= 1.6),
-#  tarantool-modules
-Recommends: tarantool-modules
+Recommends: tarantool-common (>= 1.6),
+ tarantool-modules
 Description: In-memory database with Lua application server
  Tarantool is an in-memory database and Lua application server.
  Its key properties include:
diff --git a/debian/rules b/debian/rules
index 4415b71d73686d13b7ec167f2518c9000ec54f19..e69cba28f616d143b6e4f25b3444fd7d327230db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,8 @@ clean::
 #         rm -fr debian/tarantool-dbg/usr/share/doc/tarantool-dbg
 
 install/tarantool::
-	pod2man -c 'tarantar' \
-		debian/tarantar.pod > build-area/tarantar.1
+# 	pod2man -c 'tarantar' \
+# 		debian/tarantar.pod > build-area/tarantar.1
 #         make -C build-area test-force || /bin/true
 
 
diff --git a/debian/tarantool-common.install b/debian/tarantool-common.install
index 6a7125a1563aa88065583f42bf5e948e0f387c0c..f032f84defa3e17788475875769973bf31bb65d9 100644
--- a/debian/tarantool-common.install
+++ b/debian/tarantool-common.install
@@ -1,3 +1,2 @@
-debian/scripts/tarantool_instance /usr/sbin/
-debian/scripts/tarantool_snapshot_rotate /usr/sbin/
-debian/scripts/tarantool_logrotate /usr/lib/tarantool/
+extra/dist/default/tarantool /etc/default
+extra/dist/dist.lua          /usr/lib/tarantool
diff --git a/debian/tarantool-common.logrotate b/debian/tarantool-common.logrotate
index caf08ae97abec9c5d3db7be87f1a204f1a7bbe69..4fc10a52c0ddaa3f83751666ea5d07e32010e237 100644
--- a/debian/tarantool-common.logrotate
+++ b/debian/tarantool-common.logrotate
@@ -7,6 +7,7 @@
     delaycompress
     create 0640 tarantool adm
     postrotate
-        /usr/lib/tarantool/tarantool_logrotate
+        /usr/bin/tarantool /usr/lib/tarantool/dist.lua logrotate `basename $1 .log`
     endscript
 }
+
diff --git a/debian/tarantool-common.manpages b/debian/tarantool-common.manpages
index 34c98c8136e5dd33dbebae018f3a923883f5cbf4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/debian/tarantool-common.manpages
+++ b/debian/tarantool-common.manpages
@@ -1,3 +0,0 @@
-build-area/tarantool_instance.1
-build-area/tarantool_logrotate.1
-build-area/tarantool_snapshot_rotate.1