diff --git a/Makefile.am b/Makefile.am
index 333b9bd0be..3aa449e4ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,10 @@ EXTRA_DIST =                                    \
 	stripchart                                  \
     INSTALL										
 
+includedir = ${prefix}/include/BOINC
+include_HEADERS = \
+    config.h \
+    version.h
 
 dist-hook:
 	rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
diff --git a/checkin_notes b/checkin_notes
index ffd7b37804..14dfdae700 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9597,3 +9597,12 @@ Rom    31 Aug 2006
         gui_rpc_client.h
         gui_rpc_client_ops.C
 
+David  31 Aug 2006
+    - Fix Makefiles so that "install" installs needed files
+        (from Frank Thomas)
+
+    Makefile/am
+    client/
+        gui_rpc_server.C
+    lib/
+        Makefile.am
diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.C
index bbb4406b9a..8de2886dc7 100644
--- a/client/gui_rpc_server.C
+++ b/client/gui_rpc_server.C
@@ -44,7 +44,6 @@
 
 #include "util.h"
 #include "error_numbers.h"
-#include "parse.h"
 #include "network.h"
 #include "filesys.h"
 #include "md5_file.h"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 925c442085..647b89d819 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -69,22 +69,23 @@ libboinc_a_SOURCES = \
     util.C	\
 	$(mac_sources)
 
-
-
-include_HEADERS = 	\
-    app_ipc.h 		\
-    boinc_win.h 	\
-    diagnostics.h 	\
-    filesys.h 		\
-    hostinfo.h		\
-    mfile.h 		\
-    miofile.h 		\
-    parse.h 		\
-    prefs.h 		\
-    proxy_info.h 	\
-    util.h 			\
-	msg_log.h 		\
-	crypt.h
+include_HEADERS = \
+    app_ipc.h \
+    boinc_win.h \
+    crypt.h \
+    diagnostics.h \
+    error_numbers.h \
+    filesys.h \
+    gui_rpc_client.h \
+    hostinfo.h \
+    mfile.h \
+    miofile.h \
+    msg_log.h \
+    parse.h \
+    prefs.h \
+    proxy_info.h \
+    std_fixes.h \
+    util.h
 
 ## install header-files with prefix-subdir BOINC/ to avoid name-conflicts
 includedir = ${prefix}/include/BOINC/