diff -u xorg-server-1.18.3/debian/changelog xorg-server-1.18.3/debian/changelog
--- xorg-server-1.18.3/debian/changelog
+++ xorg-server-1.18.3/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.18.3-1ubuntu2) xenial; urgency=medium
+
+  * Disable 190_cache-xkbcomp_output_for_fast_start_up.patch for now,
+    compiling the keymap fails in current xenial for some reason.
+    (LP: #1566878)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 07 Apr 2016 12:10:12 +0300
+
 xorg-server (2:1.18.3-1ubuntu1) xenial; urgency=medium
 
   * Merge from Debian.
diff -u xorg-server-1.18.3/debian/patches/series xorg-server-1.18.3/debian/patches/series
--- xorg-server-1.18.3/debian/patches/series
+++ xorg-server-1.18.3/debian/patches/series
@@ -12,7 +12,7 @@
 105_nvidia_autodetect.patch
 168_glibc_trace_to_stderr.patch
 188_default_primary_to_first_busid.patch
-190_cache-xkbcomp_output_for_fast_start_up.patch
+#190_cache-xkbcomp_output_for_fast_start_up.patch
 191-Xorg-add-an-extra-module-path.patch
 226_fall_back_to_autoconfiguration.patch