diff --git a/checkin_notes b/checkin_notes
index 3b999e7c83..5bf4c78841 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7926,3 +7926,8 @@ David  18 Sept 2009
     fix-repository-20040202
     nightly-tarball
     install-sh
+
+David  21 Sept 2009
+    - Unix build fix
+
+    configure.ac
diff --git a/configure.ac b/configure.ac
index 35d8f11fb4..8d39e78ac9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ AC_PREREQ(2.58)
 
 dnl Set the BOINC version here.  You can also use the set-version script.
 AC_INIT(BOINC, 6.11.0)
+AC_CONFIG_MACRO_DIR([m4])
 LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
 AC_SUBST([LIBBOINC_VERSION])
 
diff --git a/sched/sched_config.cpp b/sched/sched_config.cpp
index b4df79c236..d1e57821a3 100644
--- a/sched/sched_config.cpp
+++ b/sched/sched_config.cpp
@@ -39,7 +39,7 @@ const char* CONFIG_FILE = "config.xml";
 
 SCHED_CONFIG config;
 
-const int MAX_NCPUS = 8;
+const int MAX_NCPUS = 16;
     // max multiplier for daily_result_quota.
     // need to change as multicore processors expand