diff --git a/checkin_notes b/checkin_notes
index 4c49eae7c3..9e7b11b63f 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6180,3 +6180,9 @@ Karl 2003/09/05
         add.py
         update_versions
 
+    - renamed add.C output to old_add and renamed add.py to add
+
+    tools/
+        Makefile.am
+        add.py -> add  (renamed)
+
diff --git a/configure b/configure
index 5d92b3da1c..d343127fd8 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.40 .
+# From configure.ac Revision: 1.41 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57 for BOINC 2.01.
 #
@@ -7839,12 +7839,17 @@ echo "--- Configured BOINC 2.01 ---"
 test/test_sanity.py || (
     cat <<EOF
 
-The framework sanity check failed.
-
-If you only want to compile the client or compile the server, this may be okay.
-
-If you want to develop BOINC and be able to run the automated tests, you need
-a MySQL server installed and running, with permission to create databases.
+******************************************************************************
+**
+** The framework sanity check failed.
+**
+** If you only want to compile (and run) the client or compile (and run) the
+** server, this may be okay.
+**
+** If you are developing BOINC and want to run the automated tests, you need a
+** MySQL server installed and running, with permission to create databases.
+**
+******************************************************************************
 
 EOF
 
diff --git a/configure.ac b/configure.ac
index c139d9008b..f018b94eb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,9 +153,9 @@ AC_CONFIG_HEADER([config.h])
 
 AC_OUTPUT
 
-[
 echo "--- Configured BOINC AC_PACKAGE_VERSION ---"
 
+[
 test/test_sanity.py || (
     cat <<EOF
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d1615435d0..19244b5394 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.incl
 
 bin_PROGRAMS = create_work old_add country_select sign_executable
 
-EXTRA_DIST = make_project add.py update_version
+EXTRA_DIST = make_project add update_version
 
 # TODO: use libboinc for these:
 
diff --git a/tools/add b/tools/add
index 5aa2ed2369..49cb202c3c 100755
--- a/tools/add
+++ b/tools/add
@@ -7,30 +7,30 @@ add items to the BOINC database.
 
 Usages:
 
-add.py project      --name=yah --long_name="YETI @ home"
+add project      --name=yah --long_name="YETI @ home"
 
-add.py platform     --name=c64 [ --user_friendly_name="Commodore 64" ]
+add platform     --name=c64 [ --user_friendly_name="Commodore 64" ]
 
-add.py core_version --platform=c64 --version_num=717
+add core_version --platform=c64 --version_num=717
                     --exec_file=/path/to/boinc_7.17_c64
                     [--message="Message"] [--message_priority="Priority"]
 
-add.py app          --name=YetiApp [--min_version=716]
+add app          --name=YetiApp [--min_version=716]
 
-add.py app_version  --app=YetiApp --platform=c64 --version_num=717
+add app_version  --app=YetiApp --platform=c64 --version_num=717
                     --exec_file=/path/to/yeti_7.17_c64
                       [--signature_file=/path/to/sig_file]
                     [--exec_file=/path/to/more_bins
                       [--signature_file=/tmp/sig_file2]] ...
 
-add.py user         --name="Carl Sagan" --email_addr="carl.sagan@example.com"
+add user         --name="Carl Sagan" --email_addr="carl.sagan@example.com"
                     --authenticator="deadbeef"
                     [--country=Estonia --postal_code=94703
                      --global_prefs_file=/path/to/prefs.xml]
 
-add.py workunit  (TODO)
+add workunit  (TODO)
 
-add.py result    (TODO) '''
+add result    (TODO) '''
 
 import boinc_path_config
 from Boinc import database, db_mid, configxml, tools
@@ -153,7 +153,7 @@ def help_object(object, msg=None):
     if msg:
         print >>sys.stderr, "add:", msg
         print
-    print >>sys.stderr, "Syntax: add.py %s"%object.name
+    print >>sys.stderr, "Syntax: add %s"%object.name
     for arg in object.args:
         print >>sys.stderr, dv(object,arg)
     print >>sys.stderr, " Optional:"
@@ -219,7 +219,7 @@ for o in list_objects_to_add:
     objects_to_add[object.name] = object
 
 if len(sys.argv) < 2:
-    print >>sys.stderr, """Syntax: add.py <object_to_add> <options...>
+    print >>sys.stderr, """Syntax: add <object_to_add> <options...>
 
 Adds an object to the BOINC database.