diff -u xserver-xorg-video-openchrome-0.3.3/debian/changelog xserver-xorg-video-openchrome-0.3.3/debian/changelog
--- xserver-xorg-video-openchrome-0.3.3/debian/changelog
+++ xserver-xorg-video-openchrome-0.3.3/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-openchrome (1:0.3.3-1ubuntu1.1) wily; urgency=medium
+
+  * Fix a segfault on X startup. (LP: #1554004)
+
+ -- Dariusz Gadomski <dariusz.gadomski@canonical.com>  Thu, 10 Mar 2016 08:54:23 +0100
+
 xserver-xorg-video-openchrome (1:0.3.3-1ubuntu1) vivid; urgency=medium
 
   * Cherry-pick from upstream. Include xorg-server.h before xf86.h to get
only in patch2:
unchanged:
--- xserver-xorg-video-openchrome-0.3.3.orig/src/via_id.c
+++ xserver-xorg-video-openchrome-0.3.3/src/via_id.c
@@ -309,7 +309,7 @@
     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                "Unknown Card-Ids (%4X|%4X|%4X), Chipset: %s; please report to openchrome-users@lists.freedesktop.org\n",
                DEVICE_ID(pVia->PciInfo), SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo), pScrn->chipset);
-    pVia->Id = NULL;
+    pVia->Id = Id;
 
     if (pVia->Chipset == VIA_CLE266)
         ViaDoubleCheckCLE266Revision(pScrn);