diff --git a/build/build-x64.bat b/build/build-x64.bat
index 7f1c3686..58cc3eeb 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -1,9 +1,12 @@
 @echo off
+set OPATH=%PATH%
+set PATH=c:\mozilla-build\msys\bin
+cd ..\src
+echo X64 = YES > makeinc.mak
+cat makeinc.skel >> makeinc.mak
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev64\include
 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64
-set OPATH=%PATH%
 set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\build\xchat-dev64\bin;c:\mozilla-build\perl-5.12-x64\bin
-cd ..\src
 nmake -f makefile.mak clean
 nmake -f makefile.mak
 cd ..\plugins\ewc
diff --git a/build/build-x86.bat b/build/build-x86.bat
index 5d28ce5e..56dd6f8d 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -1,9 +1,11 @@
 @echo off
+set OPATH=%PATH%
+set PATH=c:\mozilla-build\msys\bin
+cd ..\src
+cat makeinc.skel >> makeinc.mak
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include
 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
-set OPATH=%PATH%
 set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw32\bin;c:\mozilla-build\perl-5.12-x86\bin
-cd ..\src
 nmake -f makefile.mak clean
 nmake -f makefile.mak
 cd ..\plugins\ewc
diff --git a/build/build.bat b/build/build.bat
new file mode 100644
index 00000000..9d688162
--- /dev/null
+++ b/build/build.bat
@@ -0,0 +1,3 @@
+@echo off
+call build-x86.bat
+call build-x64.bat
diff --git a/src/makeinc.mak b/src/makeinc.skel
similarity index 100%
rename from src/makeinc.mak
rename to src/makeinc.skel