diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index 071d0fbe0c..d8a408370c 100644
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -29,10 +29,15 @@ perl makeversion.pl
 
 rem Generate header files for lib/dns
 
-dnsheadergen.bat
+call dnsheadergen.bat
 
 echo Ensure that the OpenSSL sources are at the same level in
 echo the directory tree and is named openssl-0.9.6b or libdns
 echo will not build.
 
-exit
+rem Make sure that the Build directories are there.
+
+if NOT Exist ..\Build mkdir ..\Build
+if NOT Exist ..\Build\Release mkdir ..\Build\Release
+
+rem Done
diff --git a/win32utils/dnsheadergen.bat b/win32utils/dnsheadergen.bat
index 7af0c80c24..25b18708dc 100644
--- a/win32utils/dnsheadergen.bat
+++ b/win32utils/dnsheadergen.bat
@@ -17,7 +17,7 @@ rem  WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 cd ..\lib\dns
 cd win32
-nmake -f gen.mak CFG="gen - Win32 Release"
+nmake /nologo /f gen.mak CFG="gen - Win32 Release"
 cd ..
 gen -s . -t > include/dns/enumtype.h
 gen -s . -c > include/dns/enumclass.h