Index: Setup/build.bat
==================================================================
--- Setup/build.bat
+++ Setup/build.bat
@@ -74,43 +74,45 @@
     ECHO File "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" failed.
     GOTO errors
   )
 )
 
-IF EXIST "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%_%PLATFORM%.bat" (
-  CALL :fn_ResetErrorLevel
-
-  %_AECHO% Running "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%_%PLATFORM%.bat"...
-  %__ECHO3% CALL "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%_%PLATFORM%.bat"
-
-  IF ERRORLEVEL 1 (
-    ECHO File "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%_%PLATFORM%.bat" failed.
-    GOTO errors
-  )
-)
-
-IF EXIST "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%.bat" (
-  CALL :fn_ResetErrorLevel
-
-  %_AECHO% Running "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%.bat"...
-  %__ECHO3% CALL "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%.bat"
-
-  IF ERRORLEVEL 1 (
-    ECHO File "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%.bat" failed.
-    GOTO errors
-  )
-)
-
-IF EXIST "%TOOLS%\set_user_%USERNAME%.bat" (
-  CALL :fn_ResetErrorLevel
-
-  %_AECHO% Running "%TOOLS%\set_user_%USERNAME%.bat"...
-  %__ECHO3% CALL "%TOOLS%\set_user_%USERNAME%.bat"
-
-  IF ERRORLEVEL 1 (
-    ECHO File "%TOOLS%\set_user_%USERNAME%.bat" failed.
-    GOTO errors
+IF NOT DEFINED NOUSER (
+  IF EXIST "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%_%PLATFORM%.bat" (
+    CALL :fn_ResetErrorLevel
+
+    %_AECHO% Running "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%_%PLATFORM%.bat"...
+    %__ECHO3% CALL "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%_%PLATFORM%.bat"
+
+    IF ERRORLEVEL 1 (
+      ECHO File "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%_%PLATFORM%.bat" failed.
+      GOTO errors
+    )
+  )
+
+  IF EXIST "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%.bat" (
+    CALL :fn_ResetErrorLevel
+
+    %_AECHO% Running "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%.bat"...
+    %__ECHO3% CALL "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%.bat"
+
+    IF ERRORLEVEL 1 (
+      ECHO File "%TOOLS%\set_user_%USERNAME%_%BASE_CONFIGURATION%.bat" failed.
+      GOTO errors
+    )
+  )
+
+  IF EXIST "%TOOLS%\set_user_%USERNAME%.bat" (
+    CALL :fn_ResetErrorLevel
+
+    %_AECHO% Running "%TOOLS%\set_user_%USERNAME%.bat"...
+    %__ECHO3% CALL "%TOOLS%\set_user_%USERNAME%.bat"
+
+    IF ERRORLEVEL 1 (
+      ECHO File "%TOOLS%\set_user_%USERNAME%.bat" failed.
+      GOTO errors
+    )
   )
 )
 
 IF NOT DEFINED MSBUILD (
   SET MSBUILD=MSBuild.exe

Index: www/build.wiki
==================================================================
--- www/build.wiki
+++ www/build.wiki
@@ -392,10 +392,11 @@
 
     <li>
       Enter the following command to build the managed-only binaries for Mono:
       <br />
       <br />
+      <b>SET NOUSER=1</b>
       <b>build.bat&nbsp;ReleaseManagedOnly</b>
       <br />
       <br />
     </li>