diff -u xorg-server-1.18.4/debian/changelog xorg-server-1.18.4/debian/changelog
--- xorg-server-1.18.4/debian/changelog
+++ xorg-server-1.18.4/debian/changelog
@@ -1,3 +1,15 @@
+xorg-server (2:1.18.4-1ubuntu9) zesty; urgency=medium
+
+  * control: Depend on libxfont1-dev.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 15 Dec 2016 13:44:15 +0200
+
+xorg-server (2:1.18.4-1ubuntu8) zesty; urgency=medium
+
+  * xvfb-run: Bump default bitdepth to 16 so that GLX works.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 15 Dec 2016 12:33:01 +0200
+
 xorg-server (2:1.18.4-1ubuntu7) zesty; urgency=medium
 
   * modesetting-unifdef-slave-support.diff: Fix modesetting slave output
diff -u xorg-server-1.18.4/debian/control xorg-server-1.18.4/debian/control
--- xorg-server-1.18.4/debian/control
+++ xorg-server-1.18.4/debian/control
@@ -43,7 +43,7 @@
  x11proto-input-dev (>= 2.3),
  x11proto-dri2-dev (>= 2.8),
  libxdmcp-dev (>= 1:0.99.1),
- libxfont-dev (>= 1:1.4.2),
+ libxfont1-dev (>= 1:1.4.2),
  libxkbfile-dev (>= 1:0.99.1),
  libpixman-1-dev (>= 0.27.2),
  libpciaccess-dev (>= 0.12.901),
@@ -218,7 +218,7 @@
  x11proto-xf86bigfont-dev (>= 1.2.0),
  x11proto-dri3-dev,
  x11proto-present-dev,
- libxfont-dev,
+ libxfont1-dev,
  libxkbfile-dev,
  libpciaccess-dev,
  mesa-common-dev,
diff -u xorg-server-1.18.4/debian/local/xvfb-run xorg-server-1.18.4/debian/local/xvfb-run
--- xorg-server-1.18.4/debian/local/xvfb-run
+++ xorg-server-1.18.4/debian/local/xvfb-run
@@ -14,7 +14,7 @@
 SERVERNUM=99
 AUTHFILE=
 ERRORFILE=/dev/null
-XVFBARGS="-screen 0 640x480x8"
+XVFBARGS="-screen 0 640x480x16"
 LISTENTCP="-nolisten tcp"
 XAUTHPROTO=.