diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c
index 33f691bf5f3..a52a07cd93a 100644
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
@@ -105,9 +105,9 @@ intel_draw_buffer(struct gl_context * ctx, struct gl_framebuffer *fb)
    /*
     * If intel_context is using separate stencil, but the depth attachment
     * (gl_framebuffer.Attachment[BUFFER_DEPTH]) has a packed depth/stencil
-    * format, then we must install the real depth buffer at
-    * gl_framebuffer._DepthBuffer before calling _mesa_update_framebuffer.
-    * Otherwise, _mesa_update_framebuffer will create and install a swrast
+    * format, then we must install the real depth buffer at fb->_DepthBuffer
+    * and set fb->_DepthBuffer->Wrapped before calling _mesa_update_framebuffer.
+    * Otherwise, _mesa_update_framebuffer will create and install a swras
     * depth wrapper instead.
     *
     * Ditto for stencil.
@@ -115,11 +115,13 @@ intel_draw_buffer(struct gl_context * ctx, struct gl_framebuffer *fb)
    irbDepth = intel_get_renderbuffer(fb, BUFFER_DEPTH);
    if (irbDepth && irbDepth->Base.Format == MESA_FORMAT_X8_Z24) {
       _mesa_reference_renderbuffer(&fb->_DepthBuffer, &irbDepth->Base);
+      irbDepth->Base.Wrapped = fb->Attachment[BUFFER_DEPTH].Renderbuffer;
    }
 
    irbStencil = intel_get_renderbuffer(fb, BUFFER_STENCIL);
    if (irbStencil && irbStencil->Base.Format == MESA_FORMAT_S8) {
       _mesa_reference_renderbuffer(&fb->_StencilBuffer, &irbStencil->Base);
+      irbStencil->Base.Wrapped = fb->Attachment[BUFFER_STENCIL].Renderbuffer;
    }
 
    /* Do this here, not core Mesa, since this function is called from