diff --git a/dbms/src/Server/CMakeLists.txt b/dbms/src/Server/CMakeLists.txt
index 86528241790c413a89a2561ee90b2f046886e9c7..83eb1d7bd55bd3e74c4b7db29d720f968d82eae1 100644
--- a/dbms/src/Server/CMakeLists.txt
+++ b/dbms/src/Server/CMakeLists.txt
@@ -20,7 +20,7 @@ INSTALL(TARGETS clickhouse RUNTIME DESTINATION bin COMPONENT clickhouse)
 # make symbolic links to concrete clickhouse applications
 macro(install_symlink_to_clickhouse app)
 	INSTALL(CODE "execute_process(COMMAND ln -sf clickhouse ${app} WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\" )" COMPONENT ${app})
-endmacro(make_symlink_to_clickhouse)
+endmacro(install_symlink_to_clickhouse)
 
 install_symlink_to_clickhouse(clickhouse-server)
 install_symlink_to_clickhouse(clickhouse-client)
diff --git a/debian/clickhouse-benchmark-metrika-yandex.install b/debian/clickhouse-benchmark.install
similarity index 100%
rename from debian/clickhouse-benchmark-metrika-yandex.install
rename to debian/clickhouse-benchmark.install
diff --git a/debian/clickhouse-local-metrika-yandex.install b/debian/clickhouse-local.install
similarity index 100%
rename from debian/clickhouse-local-metrika-yandex.install
rename to debian/clickhouse-local.install
diff --git a/debian/clickhouse-local-metrika-yandex.postinst b/debian/clickhouse-local.postinst
similarity index 100%
rename from debian/clickhouse-local-metrika-yandex.postinst
rename to debian/clickhouse-local.postinst
diff --git a/debian/clickhouse-server-base.install b/debian/clickhouse-server-base.install
index e6d5bbb79210cee45615aa972e8303d8bed94015..71f17f3a8ab29c11407b769fda3f17bf55857cb4 100644
--- a/debian/clickhouse-server-base.install
+++ b/debian/clickhouse-server-base.install
@@ -1,3 +1,4 @@
+/usr/bin/clickhouse
 /usr/bin/clickhouse-server
 /etc/cron.d/clickhouse-server
 /etc/security/limits.d/metrika.conf
diff --git a/release_lib.sh b/release_lib.sh
index 7cf15aa7332e8032bbbd22af357ed0ddff5f719a..cc4929dd9fabd4154019ae68d6771b041452b2ac 100644
--- a/release_lib.sh
+++ b/release_lib.sh
@@ -39,10 +39,13 @@ function make_control {
 			add_daemon_impl clickhouse-server-common "clickhouse-server-base(=1.1.$REVISION)" 'Common configuration files for clickhouse-server-base package'
 		;;
 		'clickhouse-client' )
-			add_daemon_impl clickhouse-client
+			add_daemon_impl clickhouse-client "clickhouse-server-base(=1.1.$REVISION)" "ClickHouse client"
 		;;
 		'clickhouse-benchmark' )
-			add_daemon_impl clickhouse-benchmark
+			add_daemon_impl clickhouse-benchmark "clickhouse-server-base(=1.1.$REVISION)" "ClickHouse benchmark tool"
+		;;
+		'clickhouse-local' )
+			add_daemon_impl clickhouse-local "clickhouse-server-base(=1.1.$REVISION)" "ClickHouse local server application"
 		;;
 		* )
 			add_daemon_impl "${DAEMON_PKG}-metrika-yandex"