diff --git a/aclocal.m4 b/aclocal.m4
index ef2e68a690..0697245a0d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1106,8 +1106,8 @@ AC_DEFUN([SAH_HEADER_STDCXX],[
 #
 # Revision Log:
 # $Log$
-# Revision 1.139  2004/08/11 11:36:28  davea
-# *** empty log message ***
+# Revision 1.140  2004/08/24 20:51:39  boincadm
+# version 4.04
 #
 # Revision 1.1  2003/12/11 18:38:24  korpela
 # Added checked macro files into boinc
diff --git a/client/win/win_config.h b/client/win/win_config.h
index 7123e5258c..366c8318fd 100644
--- a/client/win/win_config.h
+++ b/client/win/win_config.h
@@ -1,3 +1,3 @@
 #define BOINC_MAJOR_VERSION 4
-#define BOINC_MINOR_VERSION 3
-#define BOINC_VERSION_STRING "4.03"
+#define BOINC_MINOR_VERSION 4
+#define BOINC_VERSION_STRING "4.04"
diff --git a/configure b/configure
index 89ca87e087..56cb3d81fa 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 1.117 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for BOINC 4.03.
+# Generated by GNU Autoconf 2.57 for BOINC 4.04.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -287,8 +287,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='BOINC'
 PACKAGE_TARNAME='boinc'
-PACKAGE_VERSION='4.03'
-PACKAGE_STRING='BOINC 4.03'
+PACKAGE_VERSION='4.04'
+PACKAGE_STRING='BOINC 4.04'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="lib/shmem.C"
@@ -814,7 +814,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures BOINC 4.03 to adapt to many kinds of systems.
+\`configure' configures BOINC 4.04 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -881,7 +881,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of BOINC 4.03:";;
+     short | recursive ) echo "Configuration of BOINC 4.04:";;
    esac
   cat <<\_ACEOF
 
@@ -976,7 +976,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-BOINC configure 4.03
+BOINC configure 4.04
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1011,7 +1011,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by BOINC $as_me 4.03, which was
+It was created by BOINC $as_me 4.04, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -1381,7 +1381,7 @@ else
     fi
 fi
 
-echo "--- Configuring BOINC 4.03 (${configured_to_build}) ---"
+echo "--- Configuring BOINC 4.04 (${configured_to_build}) ---"
 
 
 
@@ -1751,7 +1751,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=boinc
- VERSION=4.03
+ VERSION=4.04
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1890,9 +1890,9 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 BOINC_MAJOR_VERSION=4
 
-BOINC_MINOR_VERSION=3
+BOINC_MINOR_VERSION=4
 
-BOINC_VERSION_STRING=4.03
+BOINC_VERSION_STRING=4.04
 
 
 
@@ -1916,7 +1916,7 @@ cat >>confdefs.h <<_ACEOF
 #define HOSTTYPE "$host"
 _ACEOF
 
-CLIENT_BIN_FILENAME=boinc_4.03_$host${EXEEXT}
+CLIENT_BIN_FILENAME=boinc_4.04_$host${EXEEXT}
 
 TOP_BUILD_DIR=`pwd`
 
@@ -8321,7 +8321,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by BOINC $as_me 4.03, which was
+This file was extended by BOINC $as_me 4.04, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8384,7 +8384,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-BOINC config.status 4.03
+BOINC config.status 4.04
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -9304,7 +9304,7 @@ if test "$no_create" != yes; then
 fi
 
 
-echo "--- Configured BOINC 4.03 (${configured_to_build}) ---"
+echo "--- Configured BOINC 4.04 (${configured_to_build}) ---"
 
 
 true || $TOP_SOURCE_DIR/test/test_sanity.py || (
diff --git a/configure.ac b/configure.ac
index 7d78c35fd0..6771bafaa3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl not sure exactly what the minimum version is (but 2.13 won't work)
 AC_PREREQ(2.57)
 
 dnl Set the BOINC version here.  You can also use the set-version script.
-AC_INIT(BOINC, 4.03)
+AC_INIT(BOINC, 4.04)
 
 AC_ARG_ENABLE(server, 
     AC_HELP_STRING([--disable-server],