diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 4a343a6ff..553b3b652 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -1892,7 +1892,7 @@ DoGetDrawableAttributes(__GLXclientState * cl, XID drawId)
     ClientPtr client = cl->client;
     xGLXGetDrawableAttributesReply reply;
     __GLXdrawable *pGlxDraw;
-    CARD32 attributes[10];
+    CARD32 attributes[12];
     int numAttribs = 0, error;
 
     if (!validGlxDrawable(client, drawId, GLX_DRAWABLE_ANY,
@@ -1915,6 +1915,9 @@ DoGetDrawableAttributes(__GLXclientState * cl, XID drawId)
     attributes[8] = GLX_HEIGHT;
     attributes[9] = pGlxDraw->pDraw->height;
     numAttribs++;
+    attributes[10] = GLX_FBCONFIG_ID;
+    attributes[11] = pGlxDraw->config->fbconfigID;
+    numAttribs++;
 
     reply = (xGLXGetDrawableAttributesReply) {
         .type = X_Reply,