diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 32b7c29..89c69d7 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -31,6 +31,7 @@
 SConscript('state_trackers/python/SConscript')
 SConscript('state_trackers/glx/xlib/SConscript')
 SConscript('state_trackers/dri/SConscript')
+SConscript('state_trackers/xorg/SConscript')
 
 if platform == 'windows':
 	SConscript('state_trackers/wgl/SConscript')
diff --git a/src/gallium/state_trackers/xorg/SConscript b/src/gallium/state_trackers/xorg/SConscript
new file mode 100644
index 0000000..15ebcf8
--- /dev/null
+++ b/src/gallium/state_trackers/xorg/SConscript
@@ -0,0 +1,26 @@
+#######################################################################
+# SConscript for xorg state_tracker
+
+Import('*')
+
+if 'xorg' in env['statetrackers']:
+
+    env = env.Clone()
+
+    env.Append(CPPPATH = [
+	'#/src/mesa',
+    ])
+
+    env.ParseConfig('pkg-config --cflags --libs xorg-server')
+
+    st_xorg = env.ConvenienceLibrary(
+	target = 'st_xorg',
+	source = [ 'xorg_composite.c',
+		'xorg_crtc.c',
+		'xorg_dri2.c',
+		'xorg_driver.c',
+		'xorg_exa.c',
+		'xorg_output.c',
+		]
+    )
+    Export('st_xorg')