diff --git a/meson.build b/meson.build
index 3922733a073c2..1f6658bbacf98 100644
--- a/meson.build
+++ b/meson.build
@@ -152,7 +152,6 @@ if _drivers != ''
   with_gallium_etnaviv = _split.contains('etnaviv')
   with_gallium_imx = _split.contains('imx')
   with_gallium = true
-  with_dri = true
 endif
 
 if with_dri_swrast and with_gallium_softpipe
@@ -192,7 +191,9 @@ if with_glx == 'auto'
   if with_dri
     with_glx = 'dri'
   elif with_gallium
-    with_glx = 'gallium-xlib'
+    # Even when building just gallium drivers the user probably wants dri
+    with_glx = 'dri'
+    with_dri = true
   elif with_platform_x11 and with_any_opengl and not with_any_vk
     # The automatic behavior should not be to turn on xlib based glx when
     # building only vulkan drivers
@@ -202,7 +203,7 @@ if with_glx == 'auto'
   endif
 endif
 
-if not (with_dri or with_gallium or with_glx == 'xlib')
+if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib')
   with_gles1 = false
   with_gles2 = false
   with_opengl = false
@@ -254,6 +255,8 @@ if with_glx != 'disabled'
   elif with_glx == 'gallium-xlib' 
     if not with_gallium
       error('Gallium-xlib based GLX requires at least one gallium driver')
+    elif not with_gallium_softpipe
+      error('Gallium-xlib based GLX requires softpipe or llvmpipe.')
     elif with_dri
       error('gallium-xlib conflicts with any dri driver')
     endif
@@ -353,11 +356,8 @@ if with_platform_x11
   if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
     pre_args += '-DHAVE_X11_PLATFORM'
   endif
-  if with_glx == 'xlib'
+  if with_glx == 'xlib' or with_glx == 'gallium-xlib'
     pre_args += '-DUSE_XSHM'
-  elif with_glx == 'gallium-xlib'
-    # TODO
-    error('TODO')
   else
     pre_args += '-DGLX_INDIRECT_RENDERING'
     if with_glx_direct
@@ -837,7 +837,7 @@ dep_xcb_sync = []
 dep_xcb_xfixes = []
 dep_xshmfence = []
 if with_platform_x11
-  if with_glx == 'xlib'
+  if with_glx == 'xlib' or with_glx == 'gallium-xlib'
     dep_x11 = dependency('x11')
     dep_xext = dependency('xext')
     dep_xcb = dependency('xcb')
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 6edfe80321d3a..31884f5b72ef4 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -65,17 +65,22 @@ endif
 if with_gallium_imx
   subdir('winsys/imx/drm')
 endif
+if with_glx == 'gallium-xlib'
+  subdir('winsys/sw/xlib')
+endif
 subdir('state_trackers/dri')
 if with_osmesa == 'gallium'
   subdir('state_trackers/osmesa')
 endif
+if with_glx == 'gallium-xlib'
+  subdir('state_trackers/glx/xlib')
+endif
 # TODO: i915
 # TODO: SVGA
 # TODO: r300
 # TODO: r600
 # TODO: SWR
 # TODO: virgl
-# TODO: winsys/sw/xlib
 # TODO: clover
 if with_dri and with_gallium
   subdir('targets/dri')
@@ -83,7 +88,9 @@ endif
 if with_osmesa == 'gallium'
   subdir('targets/osmesa')
 endif
-# TODO: xlib-glx
+if with_glx == 'gallium-xlib'
+  subdir('targets/libgl-xlib')
+endif
 # TODO: OMX
 # TODO: VA
 # TODO: vdpau
diff --git a/src/gallium/state_trackers/glx/xlib/meson.build b/src/gallium/state_trackers/glx/xlib/meson.build
new file mode 100644
index 0000000000000..f4ee75426bc89
--- /dev/null
+++ b/src/gallium/state_trackers/glx/xlib/meson.build
@@ -0,0 +1,27 @@
+# Copyright © 2017 Intel Corporation
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+libxlib = static_library(
+  'xlib',
+  files('glx_api.c', 'glx_getproc.c', 'glx_usefont.c', 'xm_api.c', 'xm_st.c'),
+  c_args : c_vis_args,
+  include_directories : [inc_common, inc_mapi, inc_mesa],
+  dependencies : [dep_x11, dep_xext, dep_xcb],
+)
diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build
new file mode 100644
index 0000000000000..825b7b4a0f19a
--- /dev/null
+++ b/src/gallium/targets/libgl-xlib/meson.build
@@ -0,0 +1,68 @@
+# Copyright © 2017 Intel Corporation
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# TODO: support non-static targets
+# Static targets are always enabled in autotools (unless you modify
+# configure.ac)
+
+gallium_xlib_c_args = [
+  '-DGALLIUM_SOFTPIPE',
+  '-DGALLIUM_RBUG',
+  '-DGALLIUME_TRACE',
+]
+gallium_xlib_ld_args = []
+gallium_xlib_link_with = []
+gallium_xlib_depends = []
+gallium_xlib_link_depends = []
+gallium_xlib_xlibvers = []
+gallium_xlib_sources = []
+
+if with_ld_version_script
+  gallium_xlib_ld_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'libgl-xlib.sym')]
+  gallium_xlib_link_depends += files('libgl-xlib.sym')
+endif
+if with_shared_glapi
+  gallium_xlib_link_with += libglapi
+endif
+if with_llvm
+  gallium_xlib_c_args += '-DGALLIUM_LLVMPIPE'
+  gallium_xlib_depends += dep_llvm
+  gallium_xlib_link_with += libllvmpipe
+endif
+# TODO: SWR
+
+libgl = shared_library(
+  'GL',
+  files('xlib.c'),
+  include_directories : [
+    inc_common, inc_gallium_winsys, inc_gallium_drivers,
+    include_directories('../../state_trackers/glx/xlib'),
+  ],
+  c_args : [c_vis_args, gallium_xlib_c_args],
+  link_args : [ld_args_bsymbolic, ld_args_gc_sections, gallium_xlib_ld_args],
+  link_depends : gallium_xlib_link_depends,
+  link_with : [
+    libxlib, libws_xlib, libsoftpipe, libtrace, librbug, libglapi_static,
+    libgallium, libmesa_util, libmesa_gallium, gallium_xlib_link_with,
+  ],
+  dependencies : [dep_clock, dep_unwind, gallium_xlib_depends],
+  install : true,
+  version : '1.5.0',
+)
diff --git a/src/gallium/winsys/sw/xlib/meson.build b/src/gallium/winsys/sw/xlib/meson.build
new file mode 100644
index 0000000000000..c7cb0ffe9d5b3
--- /dev/null
+++ b/src/gallium/winsys/sw/xlib/meson.build
@@ -0,0 +1,27 @@
+# Copyright © 2017 Intel Corporation
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+libws_xlib = static_library(
+  'ws_xlib',
+  files('xlib_sw_winsys.c'),
+  c_args : c_vis_args,
+  include_directories : inc_common,
+  dependencies : [dep_x11, dep_xext, dep_xcb],
+)