diff --git a/checkin_notes b/checkin_notes
index f00a4f1da4..2142b3badd 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -27309,3 +27309,7 @@ Bruce 17 April 2005
         ops/
             profile_screen_form.php
 
+David  17 April 2005
+    - (from Reinhard Prix) add IOKit framework to Mac compile of core client
+
+    configure.ac
diff --git a/configure.ac b/configure.ac
index 382a5889a6..df55870919 100644
--- a/configure.ac
+++ b/configure.ac
@@ -400,6 +400,16 @@ for Linux and Solaris, and will have no effect.
 	;; 
 esac
 
+ ## we need to link IOKit.framework on MacOSX for the client-build
+case $target in
+   *darwin*)  
+       if test "${enable_client}" = yes; then
+           LIBS="$LIBS -framework IOKit"
+       fi
+       ;;
+       *) ;;
+esac
+
 if ( test "${enable_client_release}" = yes ) && ( test "${enable_client}" = yes ); then
    echo "----------"
    echo "NOTE: Building portable client binaries"
diff --git a/doc/download.php b/doc/download.php
index 739ba46909..7eccc4d58b 100755
--- a/doc/download.php
+++ b/doc/download.php
@@ -140,7 +140,8 @@ Click on your computer type, or scroll down.
     If your computer is not of one of these types, you can
     <ul>
     <li> <a href=anonymous_platform.php>download the BOINC source code and compile it yourself</a> or
-    <li> <a href=download_other.php>download executables from a third-party site</a>.
+    <li> <a href=download_other.php>download executables from a third-party site</a>
+        (available for Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, and FreeBSD, and others).
     </ul>
     <p>
     Download information is also available in
@@ -207,34 +208,32 @@ version(
     win_new(),
     "<ul>
     <li>
-    <a href=acct_mgt.php>Account Management via websites</a>
+    Fixes a bug in which Intellisense/Intellipoint
+    closes applications while in screensaver mode.
     <li>
-    <a href=gui_rpc.php>Password protection for GUI RPC's</a>
+    Fixes bugs with managed deployments with Active Directory.
     <li>
-    This release should workaround the Intellisense/Intellipoint issue of
-    closing down any application while Windows is in screensaver mode.
+    A new 'Select Computer' dialog remembers
+    which computers you have connected to.
     <li>
-    This release fixes a few issues with managed deployments with 
-    Active Directory.
+    A new statistics tab has been added to the BOINC manager (thanks to
+    Jens Breitbart for the great feature).
     <li>
-    A new select computer dialog has been created that remembers
-    which computers you have connected too.
+    Support for UMTS networks.
     <li>
-    A new statistics tab has been added to the BOINC manager, thanks to
-    Jens Breitbart for the great feature.
+    Numerious usability fixes.
     <li>
-    Provide support for UMTS networks
+    Fixed connectivity problems on all platforms.
     <li>
-    Numerious usability fixes
+    Support for <a href=acct_mgt.php>account management websites</a>.
     <li>
-    Fixed a few connectivity problems on all platforms.
+    <a href=gui_rpc.php>Password protection for GUI access</a>.
     </ul>
     ",
     "<ul>
     <li>
     Applications that were built before October 2004 do not
-    display screensaver graphics
-    with the Service or Shared install type,
+    display screensaver graphics with the Service or Shared install type,
     or the Single-user install type with the password protect screensaver
     option on NT based machines.
     <li>
diff --git a/doc/gui_rpc.php b/doc/gui_rpc.php
index 1074d940d9..a963de972d 100644
--- a/doc/gui_rpc.php
+++ b/doc/gui_rpc.php
@@ -1,21 +1,18 @@
 <?php
 require_once("docutil.php");
-page_head("Framework for separate GUIs");
+page_head("Controlling the core client via RPC");
 echo "
 <p>
 The BOINC core client provides a set of RPCs
 (remote procedure calls) for control and state interrogation.
-This will enable the development of GUI (graphical user interface)
+This enables the development of GUI (graphical user interface)
 programs separately from the core client.
-This will make it easier to develop new GUIs,
-and will eliminate security issues related
-to having GUI code in the core client.
 <p>
 BOINC provides a C++ interface to these RPCs.
 The interface is based on the GUI_RPC class,
 which provides the following functions
 (the code is in <code>lib/gui_rpc_client.h</code>,
- and the program <code>gui_test.C</code> gives a usage example):
+and the program <code>boinc_cmd.C</code> gives a usage example):
 <p>
 ";
 list_start();
diff --git a/lib/msg_log.C b/lib/msg_log.C
index 47ec914809..fa33e6a9c2 100644
--- a/lib/msg_log.C
+++ b/lib/msg_log.C
@@ -44,9 +44,8 @@ using std::string;
 //
 // MSG_LOG has an "indent_level" state for how many spaces to indent output.
 // This corresponds in general to the function-call recursion level.
-// Call MSG_LOG::enter_level() to increase by 1 level
-// and leave_level() to decrease by 1 level.
-// The SCOPE_MSG_LOG class takes care of calling leave_level() for you.
+// Call MSG_LOG::enter_level() to increase or decrease by 1 level.
+// The SCOPE_MSG_LOG class takes care of these calls for you.
 // Create a SCOPE_MSG_LOG object on the stack at the beginning of a function;
 // it will increment the level by 1 on construction,
 // and decrement the level by 1 on destruction at end of scope.
@@ -88,6 +87,7 @@ void MSG_LOG::vprintf(int kind, const char* format, va_list va) {
 }
 
 // break a multi-line string into lines (so that we show prefix on each line)
+//
 void MSG_LOG::vprintf_multiline(
     int kind, const char* str, const char* prefix_format, va_list va
 ) {
diff --git a/version.h b/version.h
index abb72abe73..7836bd9263 100644
--- a/version.h
+++ b/version.h
@@ -7,10 +7,10 @@
 #define BOINC_MAJOR_VERSION 4
 
 /* Minor part of BOINC version number */
-#define BOINC_MINOR_VERSION 35
+#define BOINC_MINOR_VERSION 30
 
 /* String representation of BOINC version number */
-#define BOINC_VERSION_STRING "4.35"
+#define BOINC_VERSION_STRING "4.30"
 
 #ifdef _WIN32
 /* Name of package */
@@ -23,13 +23,13 @@
 #define PACKAGE_NAME "BOINC"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "BOINC 4.35"
+#define PACKAGE_STRING "BOINC 4.30"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "boinc"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.35"
+#define PACKAGE_VERSION "4.30"
 
 #endif /* #ifdef _WIN32 */