diff --git a/composite/compwindow.c b/composite/compwindow.c
index 73a1871a0b25c88c0ea1b8ecf7a93e0ce4db5d76..9a651636e36b92e7dc7b4fedc79fa3a8327917e7 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -620,6 +620,11 @@ compDestroyWindow(WindowPtr pWin)
     ret = (*pScreen->DestroyWindow) (pWin);
     cs->DestroyWindow = pScreen->DestroyWindow;
     pScreen->DestroyWindow = compDestroyWindow;
+
+    /* Did we just destroy the overlay window? */
+    if (pWin == cs->pOverlayWin)
+        cs->pOverlayWin = NULL;
+
 /*    compCheckTree (pWin->drawable.pScreen); can't check -- tree isn't good*/
     return ret;
 }
diff --git a/debian/changelog b/debian/changelog
index 0949487831990496e4cb1fcbcd6f608170ba4d15..93b489ca86cb1034f2e04bfd6d6ac6d3c30bbe7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+xorg-server (2:21.1.7-3) unstable; urgency=medium
+
+  * Enable DRI2 for the udeb build, needed in addition to DRM support
+    since 9c81b8f5b5 to build the modesetting driver. This fixes failures
+    to start X in the graphical installer under UTM (Closes: #1035014).
+    Thanks to Keith Toh for the report and the follow-up tests!
+
+ -- Cyril Brulebois <kibi@debian.org>  Wed, 03 May 2023 03:41:41 +0200
+
+xorg-server (2:21.1.7-2) unstable; urgency=high
+
+  * composite: Fix use-after-free of the COW
+    ZDI-CAN-19866/CVE-2023-1393
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 29 Mar 2023 15:11:07 +0200
+
 xorg-server (2:21.1.7-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules.flags b/debian/rules.flags
index 51026457c0e9d66e2adec4eadeb77deb49c7ee0d..bd560e13603f92320c2609e5d8237767cd91f779 100644
--- a/debian/rules.flags
+++ b/debian/rules.flags
@@ -75,7 +75,7 @@ confflags_udeb = \
 	--disable-xdm-auth-1 \
 	--disable-glx \
 	--disable-dri \
-	--disable-dri2 \
+	--enable-dri2 \
 	--disable-glamor \
 	--disable-xinerama \
 	--disable-xf86vidmode \