diff --git a/make/windows/create.bat b/make/windows/create.bat
index 6e72fa9c9e92b5d445aff49fc4f1b994c3f85efa..a9a8acea6d21b2e0f9f072bb9f4167df8b993801 100644
--- a/make/windows/create.bat
+++ b/make/windows/create.bat
@@ -82,6 +82,7 @@ for /F %%i in ('sh %HotSpotWorkSpace%/make/windows/get_msc_ver.sh') do set %%i
 
 echo **************************************************************
 set ProjectFile=%HotSpotBuildSpace%\jvm.vcproj
+echo MSC_VER = "%MSC_VER%" 
 if "%MSC_VER%" == "1200" (
 set ProjectFile=%HotSpotBuildSpace%\jvm.dsp
 echo Will generate VC6 project {unsupported}
@@ -96,11 +97,17 @@ if "%MSC_VER%" == "1600" (
 echo Will generate VC10 {Visual Studio 2010}
 set ProjectFile=%HotSpotBuildSpace%\jvm.vcxproj
 ) else (
+if "%MSC_VER%" == "1700" (
+echo Will generate VC10 {compatible with Visual Studio 2012}
+echo After opening in VS 2012, click "Update" when prompted.
+set ProjectFile=%HotSpotBuildSpace%\jvm.vcxproj
+) else (
 echo Will generate VC7 project {Visual Studio 2003 .NET}
 )
 )
 )
 )
+)
 echo %ProjectFile%
 echo **************************************************************
 
diff --git a/make/windows/makefiles/rules.make b/make/windows/makefiles/rules.make
index 693c1926526407b270eb8b776725fe50dec689e0..d728263171b67d3ea7b9face2843d7634936d28a 100644
--- a/make/windows/makefiles/rules.make
+++ b/make/windows/makefiles/rules.make
@@ -69,6 +69,13 @@ VcVersion=VC9
 VcVersion=VC10
 ProjectFile=jvm.vcxproj
 
+!elseif "$(MSC_VER)" == "1700"
+# This is VS2012, but it loads VS10 projects just fine (and will
+# upgrade them automatically to VS2012 format).
+
+VcVersion=VC10
+ProjectFile=jvm.vcxproj
+
 !else
 
 VcVersion=VC7