diff --git a/checkin_notes b/checkin_notes
index fb81a62ef3..5b51cc6f2e 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -7676,3 +7676,10 @@ David  18 July 2006
     sea/
         insecure.sh
         secure.sh
+
+Charlie 18 July 2006
+    - If bind fails, display errno on non_Win32 systems instead of -1.
+    
+    client/
+        gui_rpc_server.C
+    
\ No newline at end of file
diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.C
index b91e629784..df248e42ac 100644
--- a/client/gui_rpc_server.C
+++ b/client/gui_rpc_server.C
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#include <cerrno>
 #endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -198,6 +199,9 @@ int GUI_RPC_CONN_SET::init() {
 
     retval = bind(lsock, (const sockaddr*)(&addr), (boinc_socklen_t)sizeof(addr));
     if (retval) {
+#ifndef _WIN32
+        retval = errno;     // Display the real error code
+#endif
         msg_printf(NULL, MSG_ERROR, "GUI RPC bind failed: %d", retval);
         boinc_close_socket(lsock);
         lsock = -1;
diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings
index 449f57fea8..b12c406ca1 100755
--- a/mac_build/English.lproj/InfoPlist.strings
+++ b/mac_build/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "BOINC";
-CFBundleShortVersionString = "BOINC version 5.5.4";
-CFBundleGetInfoString = "BOINC version 5.5.4, Copyright 2006 University of California.";
+CFBundleShortVersionString = "BOINC version 5.7.0";
+CFBundleGetInfoString = "BOINC version 5.7.0, Copyright 2006 University of California.";
diff --git a/mac_build/Info.plist b/mac_build/Info.plist
index 427c9d833a..abad6dd32e 100644
--- a/mac_build/Info.plist
+++ b/mac_build/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleSignature</key>
 	<string>BNC!</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.4</string>
+	<string>5.7.0</string>
 </dict>
 </plist>
diff --git a/mac_build/Installer-Info.plist b/mac_build/Installer-Info.plist
index 13b3c8425a..f8d9e139e9 100644
--- a/mac_build/Installer-Info.plist
+++ b/mac_build/Installer-Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.4</string>
+	<string>5.7.0</string>
 </dict>
 </plist>
diff --git a/mac_build/PostInstall-Info.plist b/mac_build/PostInstall-Info.plist
index babd1e76aa..a56550c05d 100644
--- a/mac_build/PostInstall-Info.plist
+++ b/mac_build/PostInstall-Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.4</string>
+	<string>5.7.0</string>
 </dict>
 </plist>
diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist
index 3c2e5b5292..670ca90f78 100644
--- a/mac_build/ScreenSaver-Info.plist
+++ b/mac_build/ScreenSaver-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.4</string>
+	<string>5.7.0</string>
 	<key>NSPrincipalClass</key>
 	<string>BOINC_Saver_ModuleView</string>
 </dict>
diff --git a/mac_build/SystemMenu-Info.plist b/mac_build/SystemMenu-Info.plist
index 1372a5d195..6862e91a38 100644
--- a/mac_build/SystemMenu-Info.plist
+++ b/mac_build/SystemMenu-Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.4</string>
+	<string>5.7.0</string>
 </dict>
 </plist>