diff --git a/CHANGES.txt b/CHANGES.txt
index c9522c74..c257baef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,7 @@ RC1 -> RC2
 
 - Removed additional MonoDevelop files in clean action
 - Fixed naming of system libraries in Visual Studio link step
+- Set OS to Windows when generating for Visual Studio
 
 
 -----
diff --git a/src/_premake_main.lua b/src/_premake_main.lua
index d98e3cf4..b467677d 100644
--- a/src/_premake_main.lua
+++ b/src/_premake_main.lua
@@ -1,7 +1,7 @@
 --
 -- _premake_main.lua
 -- Script-side entry point for the main program logic.
--- Copyright (c) 2002-2008 Jason Perkins and the Premake project
+-- Copyright (c) 2002-2009 Jason Perkins and the Premake project
 --
 
 
@@ -108,6 +108,12 @@
 			end
 		end
 		
+
+		-- Some actions imply a particular operating system. Set it early so
+		-- it can be picked up by the scripts.
+
+		_OS = premake.actions[_ACTION].os or _OS
+
 		
 		-- If there is a project script available, run it to get the
 		-- project information, available options and actions, etc.
@@ -185,4 +191,4 @@
 		return 0
 
 	end
-	
\ No newline at end of file
+	
diff --git a/src/actions/vstudio/_vstudio.lua b/src/actions/vstudio/_vstudio.lua
index 118250a7..afd3137f 100644
--- a/src/actions/vstudio/_vstudio.lua
+++ b/src/actions/vstudio/_vstudio.lua
@@ -316,6 +316,7 @@
 		trigger         = "vs2002",
 		shortname       = "Visual Studio 2002",
 		description     = "Microsoft Visual Studio 2002",
+		os              = "windows",
 		pathstyle       = "windows",
 		
 		valid_kinds     = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },
@@ -344,6 +345,7 @@
 		trigger         = "vs2003",
 		shortname       = "Visual Studio 2003",
 		description     = "Microsoft Visual Studio 2003",
+		os              = "windows",
 		pathstyle       = "windows",
 
 		valid_kinds     = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },
@@ -372,6 +374,7 @@
 		trigger         = "vs2005",
 		shortname       = "Visual Studio 2005",
 		description     = "Microsoft Visual Studio 2005 (SharpDevelop, MonoDevelop)",
+		os              = "windows",
 		pathstyle       = "windows",
 
 		valid_kinds     = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },
@@ -400,6 +403,7 @@
 		trigger         = "vs2008",
 		shortname       = "Visual Studio 2008",
 		description     = "Microsoft Visual Studio 2008",
+		os              = "windows",
 		pathstyle       = "windows",
 
 		valid_kinds     = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },