diff --git a/README.md b/README.md
index 8c40c2c5e1f..bed36e6685a 100644
--- a/README.md
+++ b/README.md
@@ -115,9 +115,12 @@ list of installed components. It is not on by default.
 > If you encountered errors with the environment above, do the following for a workaround:
 > 1.  Download and install [Build Tools for Visual Studio 2017](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=15)
 > 2.  Install `python2.7 x86-x64` and `virtualenv`
-> 3.  Since `mach.bat` cannot find the prompt, you should execute `Developer Command Prompt for VS 2017` manually in the Windows menu. ( You may need to choose the type, such as `x86_x64 Cross Tools Command Prompt for VS 2017`, manually if it cannot recognize type correctly. )
-> 4. `cd to/the/path/servo`
-> 5. `python mach build -d`
+> 3.  Run `mach.bat build -d`. 
+
+>If you have troubles with `x64 type` prompt as `mach.bat` set by default:  
+> 1. you may need to choose and launch the type manually, such as `x86_x64 Cross Tools Command Prompt for VS 2017` in the Windows menu.)
+> 2. `cd to/the/path/servo`
+> 3. `python mach build -d`
 
 #### Cross-compilation for Android
 
diff --git a/mach.bat b/mach.bat
index c41eccd4373..74c9d146e65 100644
--- a/mach.bat
+++ b/mach.bat
@@ -10,7 +10,7 @@ set VC14VARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat
 IF EXIST "%VC14VARS%" (
   set "VS_VCVARS=%VC14VARS%"
 ) ELSE (
-  for %%e in (Enterprise Professional Community) do (
+  for %%e in (Enterprise Professional Community BuildTools) do (
     IF EXIST "%ProgramFiles32%\Microsoft Visual Studio\2017\%%e\VC\Auxiliary\Build\vcvarsall.bat" (
       set "VS_VCVARS=%ProgramFiles32%\Microsoft Visual Studio\2017\%%e\VC\Auxiliary\Build\vcvarsall.bat"
     )