diff --git a/meson.build b/meson.build
index fecb5dbac81..4cde8c76908 100644
--- a/meson.build
+++ b/meson.build
@@ -92,6 +92,7 @@ endif
 
 with_gallium = false
 with_gallium_radeonsi = false
+with_gallium_softpipe = false
 _drivers = get_option('gallium-drivers')
 if _drivers != ''
   _split = _drivers.split(',')
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index d69c3aeca39..47dbcd84414 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -27,3 +27,4 @@ subdir('drivers/ddebug')
 subdir('drivers/noop')
 subdir('drivers/trace')
 subdir('drivers/rbug')
+subdir('state_trackers/dri')
diff --git a/src/gallium/state_trackers/dri/meson.build b/src/gallium/state_trackers/dri/meson.build
new file mode 100644
index 00000000000..5d89f23a6fe
--- /dev/null
+++ b/src/gallium/state_trackers/dri/meson.build
@@ -0,0 +1,57 @@
+# Copyright © 2017 Dylan Baker
+
+# 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.
+
+files_libdri = files(
+  'dri_context.c',
+  'dri_context.h',
+  'dri_drawable.c',
+  'dri_drawable.h',
+  'dri_helpers.c',
+  'dri_helpers.h',
+  'dri_query_renderer.c',
+  'dri_query_renderer.h',
+  'dri_screen.c',
+  'dri_screen.h',
+)
+
+if with_dri
+  files_libdri += files('drisw.c')
+endif
+
+if with_dri2
+  files_libdri += files('dri2.c', 'dri2_buffer.h')
+endif
+
+libdri_c_args = []
+if with_gallium_softpipe
+  libdri_c_args += '-DGALLIUM_SOFTPIPE'
+endif
+
+libdri = static_library(
+  'dri',
+  files_libdri,
+  include_directories : [
+    inc_include, inc_util, inc_mesa, inc_mapi, inc_src, inc_gallium,
+    inc_gallium_aux, inc_dri_common,
+  ],
+  c_args : [c_vis_args, libdri_c_args],
+  dependencies : dep_libdrm,
+  build_by_default : false,
+)