diff -Nru ycmd-0+20160327+gitc3e6904/debian/changelog ycmd-0+20160327+gitc3e6904/debian/changelog
--- ycmd-0+20160327+gitc3e6904/debian/changelog	2016-04-09 11:50:26.000000000 +0100
+++ ycmd-0+20160327+gitc3e6904/debian/changelog	2017-11-08 18:21:48.000000000 +0000
@@ -1,3 +1,10 @@
+ycmd (0+20160327+gitc3e6904-1ubuntu1) xenial; urgency=high
+
+  * Add 08-bottle.patch to work correctly with archive's python-bottle
+     (LP: #1730731)
+
+ -- TJ <ubuntu@iam.tj>  Wed, 08 Nov 2017 17:55:00 +0000
+
 ycmd (0+20160327+gitc3e6904-1) unstable; urgency=low
 
   * New upstream release. (Closes: #818070)
diff -Nru ycmd-0+20160327+gitc3e6904/debian/control ycmd-0+20160327+gitc3e6904/debian/control
--- ycmd-0+20160327+gitc3e6904/debian/control	2016-04-09 11:50:26.000000000 +0100
+++ ycmd-0+20160327+gitc3e6904/debian/control	2017-11-08 18:20:35.000000000 +0000
@@ -1,7 +1,8 @@
 Source: ycmd
 Section: devel
 Priority: optional
-Maintainer: Onur Aslan <onur@onur.im>
+XSBC-Original-Maintainer: Onur Aslan <onur@onur.im>
+Maintainer: Tj <ubuntu@iam.tj>
 Build-Depends: debhelper (>= 9),
  cmake,
  dh-python,
diff -Nru ycmd-0+20160327+gitc3e6904/debian/patches/08-bottle.patch ycmd-0+20160327+gitc3e6904/debian/patches/08-bottle.patch
--- ycmd-0+20160327+gitc3e6904/debian/patches/08-bottle.patch	1970-01-01 01:00:00.000000000 +0100
+++ ycmd-0+20160327+gitc3e6904/debian/patches/08-bottle.patch	2017-11-08 17:50:54.000000000 +0000
@@ -0,0 +1,26 @@
+Description: Makes ycmd compatible with latest bottle
+ ycmd comes with it's own bottle module but this module is not included
+ in Debian package. This patch is making ycmd to compatible with latest
+ bottle.
+Forwarded: https://github.com/Valloric/ycmd/pull/673
+
+--- a/ycmd/bottle_utils.py
++++ b/ycmd/bottle_utils.py
+@@ -24,7 +24,7 @@
+ from builtins import *  # noqa
+ 
+ from future.utils import PY2
+-from ycmd.utils import ToBytes, ToUnicode
++from ycmd.utils import ToUnicode
+ import bottle
+ 
+ 
+@@ -39,5 +39,6 @@
+ # making life easier for codebases that work across versions, thus preventing
+ # tracebacks in the depths of WSGI server frameworks.
+ def SetResponseHeader( name, value ):
+-  name = ToBytes( name ) if PY2 else ToUnicode( name )
+-  bottle.response.set_header( name, ToUnicode( value ) )
++  name = name.encode( 'utf8' ) if PY2 else ToUnicode( name )
++  value = value.encode( 'utf8' ) if PY2 else ToUnicode( value )
++  bottle.response.set_header( name, value )
diff -Nru ycmd-0+20160327+gitc3e6904/debian/patches/series ycmd-0+20160327+gitc3e6904/debian/patches/series
--- ycmd-0+20160327+gitc3e6904/debian/patches/series	2016-03-31 17:16:26.000000000 +0100
+++ ycmd-0+20160327+gitc3e6904/debian/patches/series	2017-11-08 17:51:56.000000000 +0000
@@ -6,3 +6,5 @@
 05-tern-support.patch
 06-omnisharp-path.patch
 07-shebang.patch
+08-bottle.patch
+