diff -Nru libepoxy-1.3.1/debian/changelog libepoxy-1.3.1/debian/changelog
--- libepoxy-1.3.1/debian/changelog	2017-01-20 09:40:39.000000000 +0100
+++ libepoxy-1.3.1/debian/changelog	2017-06-23 23:57:39.000000000 +0200
@@ -1,3 +1,20 @@
+libepoxy (1.3.1-2ubuntu2) artful; urgency=medium
+
+  * Disable patch 8d58c890646fc1f43bcab702bb9ed6bae94daefe:
+    - this patch is causing some troubles on proprietary drivers.
+      LP: #1698233
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 23 Jun 2017 23:57:39 +0200
+
+libepoxy (1.3.1-2ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - add-null-checks.diff: Fix gtk apps crashings on Xvfb.
+      (this patch needed adjustments, probably the upstream version
+      might be incomplete)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 24 Apr 2017 16:04:27 +0200
+
 libepoxy (1.3.1-2) unstable; urgency=medium
 
   * Set myself as maintainer, with previous maintainer authorization.
@@ -16,6 +33,12 @@
 
  -- Jérémy Lal <kapouer@melix.org>  Thu, 19 Jan 2017 01:19:17 +0100
 
+libepoxy (1.3.1-1ubuntu1) zesty; urgency=medium
+
+  * add-null-checks.diff: Fix gtk apps crashings on Xvfb. (LP: #1647600)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 08 Dec 2016 14:49:13 +0200
+
 libepoxy (1.3.1-1) unstable; urgency=low
 
   * Upgrade to upstream v1.3.1 release and make the -dev package multi-arch.
@@ -34,3 +57,4 @@
   * Initial release (Closes: #737273)
 
  -- Eric Anholt <eric@anholt.net>  Fri, 31 Jan 2014 16:52:20 -0800
+
diff -Nru libepoxy-1.3.1/debian/patches/add-null-checks.diff libepoxy-1.3.1/debian/patches/add-null-checks.diff
--- libepoxy-1.3.1/debian/patches/add-null-checks.diff	1970-01-01 01:00:00.000000000 +0100
+++ libepoxy-1.3.1/debian/patches/add-null-checks.diff	2017-04-24 16:04:23.000000000 +0200
@@ -0,0 +1,43 @@
+--- libepoxy-1.3.1.orig/src/dispatch_common.c
++++ libepoxy-1.3.1/src/dispatch_common.c
+@@ -347,7 +347,7 @@ epoxy_conservative_gl_version(void)
+ bool
+ epoxy_extension_in_string(const char *extension_list, const char *ext)
+ {
+-    if (!extension_list)
++    if (!extension_list || !ext)
+         return false;
+     const char *ptr = extension_list;
+     int len = strlen(ext);
+@@ -382,6 +382,7 @@ epoxy_internal_has_gl_extension(const ch
+ 
+         for (i = 0; i < num_extensions; i++) {
+             const char *gl_ext = (const char *)glGetStringi(GL_EXTENSIONS, i);
++            if(! gl_ext) return false;
+             if (strcmp(ext, gl_ext) == 0)
+                 return true;
+         }
+--- libepoxy-1.3.1.orig/src/dispatch_egl.c
++++ libepoxy-1.3.1/src/dispatch_egl.c
+@@ -43,12 +43,16 @@ epoxy_egl_version(EGLDisplay dpy)
+ {
+     int major, minor;
+     const char *version_string;
+-    int ret;
++    int ret=0, sscanf_ret;
+ 
+-    version_string = eglQueryString(dpy, EGL_VERSION);
+-    ret = sscanf(version_string, "%d.%d", &major, &minor);
+-    assert(ret == 2);
+-    return major * 10 + minor;
++    if ((version_string = eglQueryString(dpy, EGL_VERSION)))
++    {
++        sscanf_ret = sscanf(version_string, "%d.%d", &major, &minor);
++        assert(sscanf_ret == 2);
++        ret = major * 10 + minor;
++    }
++
++    return ret;
+ }
+ 
+ bool
diff -Nru libepoxy-1.3.1/debian/patches/series libepoxy-1.3.1/debian/patches/series
--- libepoxy-1.3.1/debian/patches/series	2017-01-19 00:40:06.000000000 +0100
+++ libepoxy-1.3.1/debian/patches/series	2017-06-23 23:57:36.000000000 +0200
@@ -1,3 +1,4 @@
 upstream/b3b8bd9af7bf1fcfe544fd131f4d4f0d117ae7bc.patch
-upstream/8d58c890646fc1f43bcab702bb9ed6bae94daefe.patch
+#upstream/8d58c890646fc1f43bcab702bb9ed6bae94daefe.patch
 upstream/b8d609e8f9fc1f9c4ff359adb2c1c44619a9e7cf.patch
+add-null-checks.diff