diff --git a/tundra.lua b/tundra.lua
index 3d17f57..9c7d1b3 100644
--- a/tundra.lua
+++ b/tundra.lua
@@ -54,6 +54,7 @@ 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" },},
 	},
 
 	Units = {
diff --git a/units.lua b/units.lua
index dc58ccc..9e34509 100644
--- a/units.lua
+++ b/units.lua
@@ -8,7 +8,7 @@ StaticLibrary {
 		Dir = "src",
 		Extensions = { ".cpp", ".c", ".h", ".s", ".m" },
 		Filters = {
-			{ Pattern = "[/\\]win32[/\\]"; Config = "win32-*" },
+			{ Pattern = "[/\\]windows[/\\]"; Config = { "win32-*", "win64-*" } },
 			{ Pattern = "[/\\]macosx[/\\]"; Config = "mac*-*" },
 			{ Pattern = "[/\\]unix[/\\]"; Config = { "freebsd*-*", "linux*-*" } },
 		},