diff --git a/debian/changelog b/debian/changelog
index 4d9871a5ef372466f49ab44b6dbf5e150f5d38ec..a72e796df707500caa200eb58f393ff72d94a16e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tarantool-lts (1.5.5-18-g2998d20-1) unstable; urgency=medium
+
+  * Add conflict with tarantool, closes: #793867.
+
+ -- Dmitry E. Oboukhov <unera@debian.org>  Sat, 12 Sep 2015 12:13:42 +0300
+
 tarantool-lts (1.5.4.28.gfcf2fef-1) unstable; urgency=medium
 
   * Tarantool 1.6 and tarantool 1.5 aren't compatible, so
diff --git a/debian/control b/debian/control
index c2166b844cb1eccc32aecf44fe8d16327f06f2b5..fe5c62babc81062df1ec6e4b485481cac791234b 100644
--- a/debian/control
+++ b/debian/control
@@ -115,7 +115,7 @@ Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: tarantool-lts, tarantool-tls-client-dbg
-Conflicts: tarantool-client (<< 1.6)
+Conflicts: tarantool-client (<< 1.6), tarantool
 Replaces: tarantool-client (<< 1.6)
 Description: Tarantool in-memory database - command line client
  Tarantool is an in-memory database and Lua application server.