diff --git a/checkin_notes b/checkin_notes
index 8f53bca71f..ee35c3ad92 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -17110,3 +17110,9 @@ David  7 Sept 2004
 
 	client/
 		whetstone.C
+
+David  7 Sept 2004
+    - change "upgrade" to query user before overwriting files
+
+    tools/
+        upgrade
diff --git a/tools/upgrade b/tools/upgrade
index 4c0652fd36..dad496d18a 100755
--- a/tools/upgrade
+++ b/tools/upgrade
@@ -3,16 +3,18 @@
 # $Id$
 
 '''
-This program upgrades the project (created using make_project) with current
-source/build files.  Useful if you are a BOINC developer or closely following
-BOINC development.
+This program upgrades the project with current source/build files.
+Useful if you are a BOINC developer or closely following BOINC development.
 '''
 
 import boinc_path_config
-from Boinc import boinc_project_path
+from Boinc import boinc_project_path, tools
 from Boinc.setup_project import *
 import os
 
+if not tools.query_noyes("Update project executables and PHP files (overwrite existing files)"):
+    raise SystemExit
+
 if os.system(os.path.join(boinc_project_path.PROGRAM_PARENT_DIR,'bin/stop')):
     raise SystemExit("Couldn't stop BOINC!")