diff --git a/Bootstrap.bat b/Bootstrap.bat
index 2eae39c7..375485a0 100755
--- a/Bootstrap.bat
+++ b/Bootstrap.bat
@@ -97,10 +97,15 @@ FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (
 	IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" (
 		CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
 		EXIT /B %ERRORLEVEL%
+	) ELSE (
+		IF EXIST "%%i\VC\Auxiliary\Build\vcvars64.bat" (
+			CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
+			EXIT /B %ERRORLEVEL%
+		)
 	)
 )
 
-ECHO Could not find vcvars32.bat to setup Visual Studio environment
+ECHO Could not find vcvars32.bat or vcvars64.bat to setup Visual Studio environment
 EXIT /B 2
 
 REM :VsWhereVisualBootstrap
diff --git a/premake5.lua b/premake5.lua
index 82c7093c..db787a13 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -112,8 +112,10 @@
 			--
 			{ "Win32", "Same as x86" },
 			{ "x64", "Same as x86_64" },
+			--
+			{ "default", "Generates default platforms for targets, x86 and x86_64 projects for Windows." }
 		},
-		default = "x86",
+		default = "default",
 	}
 
 --
@@ -166,6 +168,9 @@
 		filter { "system:windows", "options:arch=x86_64 or arch=x64" }
 			platforms { "x64" }
 
+		filter { "system:windows", "options:arch=default" }
+			platforms { "x86", "x64" }
+
 		filter "configurations:Debug"
 			defines     "_DEBUG"
 			flags       { "Symbols" }
diff --git a/scripts/package.lua b/scripts/package.lua
index acbfcdd5..25244ab2 100644
--- a/scripts/package.lua
+++ b/scripts/package.lua
@@ -24,6 +24,7 @@
 
 	if os.ishost("windows") then
 		allowedCompilers = {
+			"vs2022",
 			"vs2019",
 			"vs2017",
 			"vs2015",