diff --git a/utils/nightly/linux.crontab b/utils/nightly/linux_gmsh.crontab
similarity index 100%
rename from utils/nightly/linux.crontab
rename to utils/nightly/linux_gmsh.crontab
diff --git a/utils/nightly/mac.crontab b/utils/nightly/mac_gmsh.crontab
similarity index 100%
rename from utils/nightly/mac.crontab
rename to utils/nightly/mac_gmsh.crontab
diff --git a/utils/nightly/windows.sh b/utils/nightly/windows.sh
index 1aaee942b12b9aacab70dd81c846919ce20aece0..729afa9cdf1767590a1d61f9c44ae7f67f371ce2 100755
--- a/utils/nightly/windows.sh
+++ b/utils/nightly/windows.sh
@@ -5,9 +5,12 @@ GMSH=${HOME}/src/gmsh
 LOG=${GMSH}/nightly.log
 WEB_BIN=geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Windows
 CMAKE=cmake
-PETSC_DIR=${HOME}/src/petsc-3.0.0-p7
-PETSC_ARCH=umfpack-cxx-opt
+CC=/usr/bin/i686-w64-mingw32-gcc.exe
+CXX=/usr/bin/i686-w64-mingw32-g++.exe
+FC=/usr/bin/i686-w64-mingw32-gfortran.exe
+PETSC_DIR=${HOME}/src/petsc-3.0.0-p12
 SLEPC_DIR=${HOME}/src/slepc-3.0.0-p7
+PETSC_ARCH=win32_complex_umfpack
 
 rm -f ${LOG}
 rm -rf ${GMSH}/bin
@@ -16,9 +19,7 @@ cd ${GMSH} && svn update >> ${LOG} 2>&1
 mkdir ${GMSH}/bin
 cd ${GMSH}/bin && \
   ${CMAKE} -DGMSH_EXTRA_VERSION:string="${EXTRA_VERSION}"\
-           -DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade"\
-           -DCMAKE_CXX_FLAGS:string="-mno-cygwin"\
-           -DCMAKE_C_FLAGS:string="-mno-cygwin"\
+           -DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade;/usr/i686-w64-mingw32/sys-root/mingw"\
            -DENABLE_SWIG:bool=FALSE\
   ${GMSH} >> ${LOG} 2>&1
 cd ${GMSH}/bin && make html >> ${LOG} 2>&1
diff --git a/utils/nightly/windows.bat b/utils/nightly/windows_gmsh.bat
similarity index 100%
rename from utils/nightly/windows.bat
rename to utils/nightly/windows_gmsh.bat