diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8ce1baf4153ff16c4d0e16142edd30cbed19dda..2360aed0fc6a663bd4c364beb847a3a8c84c7f30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,13 @@ if(ENABLE_BLAS_LAPACK)
       set(HAVE_LAPACK TRUE)
       list(APPEND CONFIG_OPTIONS "RefBlas" "RefLapack")
     endif(EASY_LAPACK AND EASY_BLAS AND EASY_G2C AND EASY_GCC)
+  elseif(APPLE)
+    # on Mac we know blas and lapack are available, so don't force users
+    # to install a Fortran compiler
+    set(LAPACK_LIBRARIES "-llapack -lblas")
+    set(HAVE_BLAS TRUE)
+    set(HAVE_LAPACK TRUE)
+    list(APPEND CONFIG_OPTIONS "Blas" "Lapack")
   endif(WIN32)
   if(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
     enable_language(Fortran)
diff --git a/utils/nightly/linux.sh b/utils/nightly/linux.sh
index a97c42af62c37aa845a9b85cd78ccbf82429477e..69f085bdf662cb3972aa1696f762a9661255c245 100755
--- a/utils/nightly/linux.sh
+++ b/utils/nightly/linux.sh
@@ -3,16 +3,18 @@
 GMSH=${HOME}/src/gmsh
 LOG=${GMSH}/nightly.log
 WEB_BIN=geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Linux
+CMAKE=cmake
 
 rm -f ${LOG}
 rm -rf ${GMSH}/bin
-mkdir ${GMSH}/bin
 echo "BUILD BEGIN: `date`" > ${LOG}
 cd ${GMSH} && export CVS_RSH=ssh && cvs update -dPA >> ${LOG} 2>&1
+mkdir ${GMSH}/bin
 cd ${GMSH}/bin && \
-  cmake -DGMSH_EXTRA_VERSION="-cvs"\
-        -DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade"\
-        -DENABLE_NATIVE_FILE_CHOOSER:bool=FALSE\
+  ${CMAKE} -DGMSH_EXTRA_VERSION="-cvs"\
+           -DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade"\
+           -DENABLE_KBIPACK=0\
+           -DENABLE_NATIVE_FILE_CHOOSER:bool=FALSE\
   ${GMSH} >> ${LOG} 2>&1
 cd ${GMSH}/bin && make package >> ${LOG} 2>&1
 echo "BUILD END: `date`" >> ${LOG}
diff --git a/utils/nightly/mac.sh b/utils/nightly/mac.sh
index 9a1624ac8a97210f64156679f38602b1c1fe7de3..7df5f63a6eba86e438cf9b5f8583600422d35702 100755
--- a/utils/nightly/mac.sh
+++ b/utils/nightly/mac.sh
@@ -1,19 +1,22 @@
 #!/bin/sh
 
 GMSH=${HOME}/src/gmsh
-LOG=${GMSH}/nightly.log
+#LOG=${GMSH}/nightly.log
+LOG=/dev/stdout
 WEB_BIN=geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/MacOSX
+CMAKE=/usr/local/bin/cmake
 
 rm -f ${LOG}
 rm -rf ${GMSH}/bin
-mkdir ${GMSH}/bin
 echo "BUILD BEGIN: `date`" > ${LOG}
 cd ${GMSH} && export CVS_RSH=ssh && cvs update -dPA >> ${LOG} 2>&1
+mkdir ${GMSH}/bin
 cd ${GMSH}/bin && \
-  cmake -DGMSH_EXTRA_VERSION="-cvs"\
-        -DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade"\
+  ${CMAKE} -DGMSH_EXTRA_VERSION="-cvs"\
+           -DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade"\
+           -DENABLE_KBIPACK=0\
   ${GMSH} >> ${LOG} 2>&1
-cd ${GMSH}/bin && make package >> ${LOG} 2>&1
+cd ${GMSH}/bin && make package -j 4 >> ${LOG} 2>&1
 echo "BUILD END: `date`" >> ${LOG}
 scp -C ${GMSH}/bin/gmsh-*.dmg ${WEB_BIN}/gmsh-nightly-MacOSX.dmg
 scp -C ${LOG} ${WEB_BIN}/
diff --git a/utils/nightly/windows.sh b/utils/nightly/windows.sh
index 79b389be2150630dfb81f2c6ebc744fac8dbc980..57fe9951516bd185877bb06b7d784663c311c5a1 100755
--- a/utils/nightly/windows.sh
+++ b/utils/nightly/windows.sh
@@ -3,17 +3,19 @@
 GMSH=${HOME}/src/gmsh
 LOG=${GMSH}/nightly.log
 WEB_BIN=geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Windows
+CMAKE=cmake
 
 rm -f ${LOG}
 rm -rf ${GMSH}/bin
-mkdir ${GMSH}/bin
 echo "BUILD BEGIN: `date`" > ${LOG}
 cd ${GMSH} && export CVS_RSH=ssh && cvs update -dPA >> ${LOG} 2>&1
+mkdir ${GMSH}/bin
 cd ${GMSH}/bin && \
-  cmake -DCMAKE_CXX_FLAGS="-mno-cygwin"\
-        -DCMAKE_C_FLAGS="-mno-cygwin"\
-        -DGMSH_EXTRA_VERSION="-cvs"\
-        -DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade"\
+  ${CMAKE} -DGMSH_EXTRA_VERSION="-cvs"\
+           -DCMAKE_PREFIX_PATH:path="/usr/local;/usr/local/opencascade"\
+           -DCMAKE_CXX_FLAGS="-mno-cygwin"\
+           -DCMAKE_C_FLAGS="-mno-cygwin"\
+           -DENABLE_KBIPACK=0\
   ${GMSH} >> ${LOG} 2>&1
 cd ${GMSH}/bin && make package >> ${LOG} 2>&1
 echo "BUILD END: `date`" >> ${LOG}