diff --git a/base/base.pro b/base/base.pro
index 68f1898a95..a1ff0ea6c1 100644
--- a/base/base.pro
+++ b/base/base.pro
@@ -34,7 +34,6 @@ HEADERS += \
     SRC_FIRST.hpp \
     assert.hpp \
     const_helper.hpp \
-    internal/debug_new.hpp \
     internal/fast_mutex.hpp \
     math.hpp \
     pseudo_random.hpp \
diff --git a/debian/control b/debian/control
index aae2b29193..154876e0d4 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,13 @@ Description: Detailed Offline Maps of the Entire World
  map in a second! The auto-suggestion feature makes searching maps faster and 
  easier.
 
+Package: mapswithme-server
+Architecture: any
+Depends: fonts-roboto|fonts-mapswithme, ttf-dejavu-core|fonts-mapswithme, ttf-wqy-microhei|fonts-mapswithme, fonts-dzongkha|fonts-mapswithme, fonts-sil-padauk|fonts-mapswithme, fonts-khmeros-core|fonts-mapswithme, fonts-tlwg-umpush|fonts-mapswithme, fonts-sil-abyssinica|fonts-mapswithme, fonts-paktype|fonts-mapswithme, mapswithme-data, ${shlibs:Depends}, ${misc:Depends}
+Description: MapsWithMe server application
+ This package contains server application for using MapsWithMe engine in 
+ userless environments.
+
 Package: fonts-mapswithme
 Architecture: all
 Recommends: mapswithme, fontconfig
@@ -52,4 +59,4 @@ Depends: mapswithme
 Description: Detailed Offline Maps of the Entire World
  This package contains basic world maps and other resources essential for 
  MapsWithMe application. It is not meant to be installed directly, but rather
- be pulled in as a dependency of package mapswithme.
\ No newline at end of file
+ be pulled in as a dependency of package mapswithme.
diff --git a/debian/install b/debian/install
index 2faca38835..58fdea0e7a 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,2 @@
-usr/bin/*
+usr/bin/MapsWithMe
 usr/share/applications/*
\ No newline at end of file
diff --git a/debian/mapswithme-server.install b/debian/mapswithme-server.install
new file mode 100644
index 0000000000..9fc80c1854
--- /dev/null
+++ b/debian/mapswithme-server.install
@@ -0,0 +1 @@
+usr/bin/MapsWithMe-server
\ No newline at end of file
diff --git a/map_server/map_server.pro b/map_server/map_server.pro
index 35a8e48928..20122431e3 100644
--- a/map_server/map_server.pro
+++ b/map_server/map_server.pro
@@ -1,4 +1,4 @@
-TARGET = map_server
+TARGET = MapsWithMe-server
 CONFIG   += console warn_on
 CONFIG   -= app_bundle
 TEMPLATE = app
@@ -11,6 +11,9 @@ DEPENDENCIES = map gui search storage indexer graphics platform anim geometry co
 ROOT_DIR = ..
 include($$ROOT_DIR/common.pri)
 
+target.path = /usr/bin
+INSTALLS += target
+
 QT       += core gui opengl network
 
 INCLUDEPATH += $$ROOT_DIR/3party/jansson/src
diff --git a/omim.pro b/omim.pro
index 50bab3ff3b..72a996e23a 100644
--- a/omim.pro
+++ b/omim.pro
@@ -36,7 +36,7 @@ SUBDIRS = 3party \
           graphics/graphics_tests \
           gui/gui_tests \
           qt \
-          map_server \
+          map_server
 } else {
   # libraries which are used on mobile devices
   SUBDIRS = 3party \