diff --git a/tundra.lua b/tundra.lua
index 9c7d1b3..9fcdca1 100644
--- a/tundra.lua
+++ b/tundra.lua
@@ -31,6 +31,11 @@ local macosx = {
 	Frameworks = { "Cocoa" },
 }
 
+local x11 = {
+	Env = { CPPPATH = { "/usr/include", }, },
+}
+
+
 Build {
 	IdeGenerationHints = {
 		Msvc = {
@@ -54,7 +59,8 @@ Build {
 		Config { Name = "win32-msvc", Inherit = win32, Tools = { "msvc" }, SupportedHosts = { "windows" }, },
 		Config { Name = "win64-msvc", Inherit = win32, Tools = { "msvc" }, SupportedHosts = { "windows" }, },
 		Config { Name = "macosx-clang", Inherit = macosx, Tools = { "clang-osx" }, SupportedHosts = { "macosx" },},
-		Config { Name = "linux-gcc", Tools = { "gcc" }, SupportedHosts = { "linux" },},
+		Config { Name = "x11-gcc", Inherit = x11, Tools = { "gcc" }, SupportedHosts = { "linux", "freebsd" },},
+		-- Config { Name = "x11-clang", Inherit = x11, Tools = { "clang" }, SupportedHosts = { "linux", "freebsd" },},
 	},
 
 	Units = {
diff --git a/units.lua b/units.lua
index 9e34509..a1c03c0 100644
--- a/units.lua
+++ b/units.lua
@@ -10,7 +10,7 @@ StaticLibrary {
 		Filters = {
 			{ Pattern = "[/\\]windows[/\\]"; Config = { "win32-*", "win64-*" } },
 			{ Pattern = "[/\\]macosx[/\\]"; Config = "mac*-*" },
-			{ Pattern = "[/\\]unix[/\\]"; Config = { "freebsd*-*", "linux*-*" } },
+			{ Pattern = "[/\\]x11[/\\]"; Config = { "x11-*" } },
 		},
 
 		Recursive = true,
@@ -35,6 +35,8 @@ Program {
 
 	Depends = { "minifb" },
 	Sources = { "tests/noise.c" }, 
+
+	Libs = { "X11"; Config = "x11-*" },
 }
 
 Default "noise"