diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index ef19f7941d..9560c56844 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -1012,6 +1012,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
         }
     }
 
+    xorgGlxCreateVendor();
+
     /* Generate a cookie used by internal clients for authorization */
     if (g_fXdmcpEnabled || g_fAuthEnabled)
         winGenerateAuthorization();
diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build
index 87fa6c5cb7..bee4a46a4e 100644
--- a/hw/xwin/meson.build
+++ b/hw/xwin/meson.build
@@ -149,6 +149,7 @@ executable(
         libxserver_fb,
         libxserver,
         libxserver_glx,
+        libglxvnd,
         libxserver_xkb_stubs,
         libxserver_miext_shadow,
         libxserver_pseudoramix,