diff --git a/checkin_notes b/checkin_notes
index 5051079191..702853c607 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10550,3 +10550,13 @@ David  13 Aug 2005
 
     clientgui
         ViewWork.cpp
+
+Bruce 13 Aug 2005
+    - compile fixes for Mac OSX.  The autoconf/automake framework
+      now works again to build client and clientgui.
+
+    client/
+        Makefile.am
+    clientgui/
+        Makefile.am
+        BOINCGUIApp.h
diff --git a/client/Makefile.am b/client/Makefile.am
index 748aac8aea..008d22e043 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -11,6 +11,10 @@ client-bin: @CLIENT_BIN_FILENAME@
 
 LIBS += @CLIENTLIBS@
 
+if OS_DARWIN
+   LIBS+=-framework corefoundation -framework iokit
+endif
+
 bin_PROGRAMS = boinc_client
 
 EXTRA_PROGRAMS = cpu_benchmark
diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h
index dedfcfce84..9a18dce212 100644
--- a/clientgui/BOINCGUIApp.h
+++ b/clientgui/BOINCGUIApp.h
@@ -29,7 +29,7 @@
 
 #include "BOINCTaskBar.h"   // Must be included before MainDocument.h
 #ifdef __APPLE__
-#include "MacSysMenu.h"     // Must be included before MainDocument.h
+#include "mac/MacSysMenu.h"     // Must be included before MainDocument.h
 #endif
 
 #include "MainDocument.h"
diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am
index 722c31a0c8..27fe651be3 100644
--- a/clientgui/Makefile.am
+++ b/clientgui/Makefile.am
@@ -5,6 +5,10 @@ include $(top_srcdir)/Makefile.incl
 
 LIBS += @CLIENTLIBS@
 
+if OS_DARWIN
+   LIBS+=-framework foundation -framework iokit -framework screensaver
+endif
+
 bin_PROGRAMS = boinc_gui
 
 boinc_gui_SOURCES = \
@@ -33,12 +37,17 @@ boinc_gui_SOURCES = \
     ViewTransfers.cpp \
     ViewWork.cpp \
     WizAttachProject.cpp \
-    hyperlink.cpp
+    hyperlink.cpp \
+    mac/SystemMenu.m \
+    mac/mac_saver_module.cpp \
+    mac/Mac_Saver_ModuleView.m \
+    mac/MacSysMenu.cpp 
 
 EXTRA_DIST = *.h \
     res \
     msw \
-    locale 
+    locale \
+    mac/*.h
 
 boinc_gui_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(CLIENTGUIFLAGS)
 boinc_gui_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(CLIENTGUIFLAGS)