diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 3640b67..2e7fb31 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1126,7 +1126,8 @@ intel_screen_make_configs(__DRIscreen *dri_screen)
 {
    static const mesa_format formats[] = {
       MESA_FORMAT_B5G6R5_UNORM,
-      MESA_FORMAT_B8G8R8A8_UNORM
+      MESA_FORMAT_B8G8R8A8_UNORM,
+      MESA_FORMAT_B8G8R8X8_UNORM,
    };
 
    /* GLX_SWAP_COPY_OML is not supported due to page flipping. */
@@ -1164,7 +1165,10 @@ intel_screen_make_configs(__DRIscreen *dri_screen)
          }
       } else {
          depth_bits[1] = 24;
-         stencil_bits[1] = 8;
+         if (formats[i] == MESA_FORMAT_B8G8R8A8_UNORM)
+            stencil_bits[1] = 8;
+         else
+            stencil_bits[1] = 0;
       }
 
       new_configs = driCreateConfigs(formats[i],
@@ -1188,7 +1192,10 @@ intel_screen_make_configs(__DRIscreen *dri_screen)
          stencil_bits[0] = 0;
       } else {
          depth_bits[0] = 24;
-         stencil_bits[0] = 8;
+         if (formats[i] == MESA_FORMAT_B8G8R8A8_UNORM)
+            stencil_bits[1] = 8;
+         else
+            stencil_bits[1] = 0;
       }
 
       new_configs = driCreateConfigs(formats[i],
@@ -1228,7 +1235,10 @@ intel_screen_make_configs(__DRIscreen *dri_screen)
          stencil_bits[1] = 0;
       } else {
          depth_bits[1] = 24;
-         stencil_bits[1] = 8;
+         if (formats[i] == MESA_FORMAT_B8G8R8A8_UNORM)
+            stencil_bits[1] = 8;
+         else
+            stencil_bits[1] = 0;
       }
 
       if (devinfo->gen >= 7)