diff --git a/checkin_notes b/checkin_notes
index 669b0c0bf5..b3f73395d4 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -1068,4 +1068,9 @@ Rom    27 Jan 2006
         boinc_ss.rc
         win_screensaver.cpp, .h
 
- 
\ No newline at end of file
+David  27 Jan 2006
+    - server build fix for Mac OS X 10.3
+        (from Derek Wright)
+
+    m4/
+        kc_mysql.m4
diff --git a/m4/kc_mysql.m4 b/m4/kc_mysql.m4
index 0f78ef78b3..aed70a6502 100644
--- a/m4/kc_mysql.m4
+++ b/m4/kc_mysql.m4
@@ -15,9 +15,24 @@ if test -z "$MYSQL_CONFIG"; then
 else
     AC_MSG_CHECKING(mysql libraries)
     MYSQL_LIBS=`${MYSQL_CONFIG} --libs`
+
+    # This is so silly, but Apple actually has a bug in their
+    # mysql_config script (same bug in their curl-config, too).
+    # Fixed in 10.4, but we need to correct this for 10.3...
+    case "${host}" in
+    powerpc-apple-darwin7*)
+        MYSQL_LIBS=`echo $MYSQL_LIBS | sed -e 's|-arch i386||g'`
+        ;;
+    esac
     AC_MSG_RESULT($MYSQL_LIBS)
     AC_MSG_CHECKING(mysql includes)
     MYSQL_CFLAGS=`${MYSQL_CONFIG} --cflags`
+    # Same bug...
+    case "${host}" in
+    powerpc-apple-darwin7*)
+        MYSQL_CFLAGS=`echo $MYSQL_CFLAGS | sed -e 's|-arch i386||g'`
+        ;;
+    esac
     AC_MSG_RESULT($MYSQL_CFLAGS)
     no_mysql=no
 fi