diff --git a/checkin_notes b/checkin_notes
index 0d0b937079..a35460ef6d 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9226,3 +9226,9 @@ David  Jan 15 2004
     sched/
         file_upload_handler.C
         handle_request.C
+
+Karl 2004-01-15
+    - makefile fixes
+
+    py/Boinc/
+        Makefile.am
diff --git a/client/win/resource.rc b/client/win/resource.rc
index 5b382ee6f8..44f3887dda 100755
--- a/client/win/resource.rc
+++ b/client/win/resource.rc
@@ -285,7 +285,7 @@ IDI_ICONWARNING         ICON    DISCARDABLE     "res\\iconwarning.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,17,0
+ FILEVERSION 2,0,18,0
  PRODUCTVERSION 2,15,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -303,12 +303,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Space Sciences Laboratory\0"
             VALUE "FileDescription", "boinc_gui\0"
-            VALUE "FileVersion", "2, 0, 17, 0\0"
+            VALUE "FileVersion", "2, 0, 18, 0\0"
             VALUE "InternalName", "boinc_gui\0"
             VALUE "LegalCopyright", "Copyright © 2003 SETI@home\0"
             VALUE "OriginalFilename", "boinc_gui.exe\0"
             VALUE "ProductName", "BOINC Core Client\0"
-            VALUE "ProductVersion", "2, 0, 17, 0\0"
+            VALUE "ProductVersion", "2, 0, 18, 0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/client/win/win_config.h b/client/win/win_config.h
index 317ea5e730..8e0174b8af 100644
--- a/client/win/win_config.h
+++ b/client/win/win_config.h
@@ -1,4 +1,4 @@
 #define MAJOR_VERSION 2
-#define MINOR_VERSION 17
-#define PACKAGE_VERSION "2.17"
-#define VERSION "2.17"
+#define MINOR_VERSION 18
+#define PACKAGE_VERSION "2.18"
+#define VERSION "2.18"
diff --git a/py/Boinc/Makefile.am b/py/Boinc/Makefile.am
index 1faa0807a7..cc01fc129d 100644
--- a/py/Boinc/Makefile.am
+++ b/py/Boinc/Makefile.am
@@ -2,22 +2,21 @@
 
 include $(top_srcdir)/Makefile.incl
 
-EXTRA_DIST = db_def_to_py			\
-	__init__.py				\
-	add_util.py				\
-	boinc_db.py				\
-	boinc_project_path.py			\
-	boincxml.py				\
-	configxml.py				\
-	database.py				\
-	db_base.py				\
-	db_mid.py				\
-	projectxml.py				\
-	sched_messages.py			\
-	setup_project.py			\
-	tools.py				\
-	util.py					\
-	version.py
+EXTRA_DIST = db_def_to_py				\
+	__init__.py					\
+	add_util.py					\
+	boinc_db.py					\
+	boinc_project_path.py				\
+	boincxml.py					\
+	configxml.py					\
+	database.py					\
+	db_base.py					\
+	db_mid.py					\
+	projectxml.py					\
+	sched_messages.py				\
+	setup_project.py				\
+	tools.py					\
+	util.py
 
 $(srcdir)/boinc_db.py: $(top_srcdir)/db/boinc_db.h $(top_srcdir)/lib/result_state.h
 	cat $^ | $(srcdir)/db_def_to_py > $@