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-1ubuntu0.1) trusty; urgency=medium
+
+  * Fix a segfault on X startup. (LP: #1554004)
+
+ -- Dariusz Gadomski <dariusz.gadomski@canonical.com>  Mon, 14 Mar 2016 12:30:51 +0100
+
 xserver-xorg-video-openchrome (1:0.3.3-1build1) trusty; urgency=medium
 
   * Rebuild for xorg 1.15 abi.
diff -u xserver-xorg-video-openchrome-0.3.3/debian/control xserver-xorg-video-openchrome-0.3.3/debian/control
--- xserver-xorg-video-openchrome-0.3.3/debian/control
+++ xserver-xorg-video-openchrome-0.3.3/debian/control
@@ -1,7 +1,8 @@
 Source: xserver-xorg-video-openchrome
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Julien Viard de Galbert <julien@vdg.blogsite.org>, Cyril Brulebois <kibi@debian.org>
 DM-Upload-Allowed: yes
 Build-Depends:
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);