diff -r 8f52c9d72d9f PCbuild/build.bat
--- a/PCbuild/build.bat	Fri Dec 11 23:48:37 2015 +0200
+++ b/PCbuild/build.bat	Mon Dec 14 17:51:03 2015 -0500
@@ -26,6 +26,9 @@
 echo.  -k  Attempt to kill any running Pythons before building (usually done
 echo.      automatically by the pythoncore project)
 echo.
+echo.Available static analysis flags
+echo.  --enable-code-analysis Build CPython with Visual Studio's Code Analysis. See: http://bugs.python.org/issue25847 for more.
+echo.
 echo.Available flags to avoid building certain modules.
 echo.These flags have no effect if '-e' is not given:
 echo.  --no-ssl      Do not attempt to build _ssl
@@ -64,6 +67,7 @@
 if "%~1"=="-v" (set verbose=/v:n) & shift & goto CheckOpts
 if "%~1"=="-k" (set kill=true) & shift & goto CheckOpts
 if "%~1"=="--test-marker" (set UseTestMarker=true) & shift & goto CheckOpts
+if "%~1"=="--enable-code-analysis" (set EnablePREfast=true) & shift & goto CheckOpts
 if "%~1"=="-V" shift & goto Version
 rem These use the actual property names used by MSBuild.  We could just let
 rem them in through the environment, but we specify them on the command line
@@ -94,6 +98,7 @@
 msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^
  /p:Configuration=%conf% /p:Platform=%platf%^
  /p:IncludeExternals=%IncludeExternals%^
+ /p:EnablePREfast=%EnablePREfast%^
  /p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^
  /p:UseTestMarker=%UseTestMarker%^
  %1 %2 %3 %4 %5 %6 %7 %8 %9