diff -Nru xserver-xorg-video-nouveau-0.0.16+git20100611.9a3d0ab4/ChangeLog xserver-xorg-video-nouveau-0.0.16+git20100706.db98ad23/ChangeLog
--- xserver-xorg-video-nouveau-0.0.16+git20100611.9a3d0ab4/ChangeLog	2010-06-12 00:24:04.000000000 +0100
+++ xserver-xorg-video-nouveau-0.0.16+git20100706.db98ad23/ChangeLog	2010-07-06 00:56:35.000000000 +0100
@@ -1,3 +1,18 @@
+commit f9df74f9563a50ed188fbf2acbc123a87c546a1f
+Author: Robert Hooker <sarvatt@ubuntu.com>
+Date:   Tue Jul 6 08:41:00 2010 +0845
+
+    Add debian tree from origin/ubuntu
+
+commit db98ad23633958e52f84501c5a2061d42d346b64
+Author: Francisco Jerez <currojerez@riseup.net>
+Date:   Tue Jun 15 15:32:36 2010 +0200
+
+    dri2: Fix for the last DRI2InfoRec ABI.
+    
+    Just pre-fill the whole structure with zeros to avoid future
+    segfaults.
+
 commit 9a3d0ab43f6335ab6cd48be4aa2f4f728386b386
 Author: Ben Skeggs <bskeggs@redhat.com>
 Date:   Fri Jun 11 21:58:38 2010 +1000
diff -Nru xserver-xorg-video-nouveau-0.0.16+git20100611.9a3d0ab4/debian/changelog xserver-xorg-video-nouveau-0.0.16+git20100706.db98ad23/debian/changelog
--- xserver-xorg-video-nouveau-0.0.16+git20100611.9a3d0ab4/debian/changelog	2010-07-06 01:12:18.000000000 +0100
+++ xserver-xorg-video-nouveau-0.0.16+git20100706.db98ad23/debian/changelog	2010-07-06 01:12:18.000000000 +0100
@@ -1,10 +1,10 @@
-xserver-xorg-video-nouveau (1:0.0.16+git20100611.9a3d0ab4-0ubuntu0sarvatt) maverick; urgency=low
+xserver-xorg-video-nouveau (1:0.0.16+git20100706.db98ad23-0ubuntu0sarvatt) maverick; urgency=low
 
-  * Checkout from git 20100611 (master branch) up to commit
-    9a3d0ab43f6335ab6cd48be4aa2f4f728386b386
+  * Checkout from git 20100706 (master branch) up to commit
+    db98ad23633958e52f84501c5a2061d42d346b64
   * Only added debian/ tree from origin/ubuntu
 
- -- Robert Hooker <sarvatt@ubuntu.com>  Fri, 11 Jun 2010 19:24:07 -0400
+ -- Robert Hooker <sarvatt@ubuntu.com>  Tue, 06 Jul 2010 08:41:38 +0845
 
 xserver-xorg-video-nouveau (1:0.0.16+git20100518+4b8f1a0-0ubuntu1) maverick; urgency=low
 
diff -Nru xserver-xorg-video-nouveau-0.0.16+git20100611.9a3d0ab4/.lastcommit xserver-xorg-video-nouveau-0.0.16+git20100706.db98ad23/.lastcommit
--- xserver-xorg-video-nouveau-0.0.16+git20100611.9a3d0ab4/.lastcommit	2010-06-12 00:23:27.000000000 +0100
+++ xserver-xorg-video-nouveau-0.0.16+git20100706.db98ad23/.lastcommit	2010-07-06 00:55:59.000000000 +0100
@@ -1 +1 @@
-commit 9a3d0ab43f6335ab6cd48be4aa2f4f728386b386
+commit db98ad23633958e52f84501c5a2061d42d346b64
diff -Nru xserver-xorg-video-nouveau-0.0.16+git20100611.9a3d0ab4/src/nouveau_dri2.c xserver-xorg-video-nouveau-0.0.16+git20100706.db98ad23/src/nouveau_dri2.c
--- xserver-xorg-video-nouveau-0.0.16+git20100611.9a3d0ab4/src/nouveau_dri2.c	2010-06-12 00:23:28.000000000 +0100
+++ xserver-xorg-video-nouveau-0.0.16+git20100706.db98ad23/src/nouveau_dri2.c	2010-07-06 00:55:59.000000000 +0100
@@ -121,7 +121,7 @@
 {
 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 	NVPtr pNv = NVPTR(pScrn);
-	DRI2InfoRec dri2;
+	DRI2InfoRec dri2 = { 0 };
 
 	if (pNv->Architecture >= NV_ARCH_30)
 		dri2.driverName = "nouveau";
@@ -135,12 +135,6 @@
 	dri2.CreateBuffer = nouveau_dri2_create_buffer;
 	dri2.DestroyBuffer = nouveau_dri2_destroy_buffer;
 	dri2.CopyRegion = nouveau_dri2_copy_region;
-#if DRI2INFOREC_VERSION >= 4
-	dri2.ScheduleSwap = NULL;
-	dri2.ScheduleWaitMSC = NULL;
-	dri2.GetMSC = NULL;
-	dri2.numDrivers = 0;
-#endif
 
 	return DRI2ScreenInit(pScreen, &dri2);
 }