diff --git a/checkin_notes b/checkin_notes
index 3b71d2a0f0..7ac43431dd 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3688,6 +3688,16 @@ Rom    10 Apr 2006
     clientgui/
         ViewWork.cpp
 
-Rom    30 Mar 2006 (boinc_core_release_5_4)
+Rom    10 Apr 2006 (boinc_core_release_5_4)
     - Tag for 5.4.0 release, all platforms
       boinc_core_release_5_4
+
+Charlie 10 Apr 2006
+    - Extend Mac screensaver safety timer of 21 Feb 2006 to all platforms.
+      (checked this in to both HEAD and boinc_core_release_5_4 branches.)
+    
+    client/
+        app_graphics.C
+        ss_logic.C
+        app.C
+        app.h
diff --git a/client/app.C b/client/app.C
index 531a78da68..8a7afe9b42 100644
--- a/client/app.C
+++ b/client/app.C
@@ -87,10 +87,8 @@ ACTIVE_TASK::ACTIVE_TASK() {
     is_ss_app = false;
     graphics_mode_acked = MODE_UNSUPPORTED;
     graphics_mode_before_ss = MODE_HIDE_GRAPHICS;
-#ifdef __APPLE__    
     graphics_mode_ack_timeout = 0;
     exit_requested = false;
-#endif
     fraction_done = 0;
     episode_start_cpu_time = 0;
     cpu_time_at_last_sched = 0;
diff --git a/client/app.h b/client/app.h
index 5e3d5a8eb1..a046b2dedf 100644
--- a/client/app.h
+++ b/client/app.h
@@ -138,14 +138,12 @@ public:
     int graphics_mode_acked;            // mode acked by app
     int graphics_mode_before_ss;        // mode before last screensaver request
     bool is_ss_app;
-#ifdef __APPLE__
     double graphics_mode_ack_timeout;   // safety timeout for Mac screensaver
     bool exit_requested;
-#ifdef __i386__
+#if (defined (__APPLE__) && defined(__i386__))
     // PowerPC apps emulated on i386 Macs crash if running graphics
     int powerpc_emulated_on_i386;
     int is_native_i386_app(char*);
-#endif
 #endif
     GRAPHICS_MSG graphics_msg;
     void request_graphics_mode(GRAPHICS_MSG&);
diff --git a/client/app_graphics.C b/client/app_graphics.C
index 84a34fa479..2c7fdcf10c 100644
--- a/client/app_graphics.C
+++ b/client/app_graphics.C
@@ -187,7 +187,6 @@ void ACTIVE_TASK_SET::graphics_poll() {
         );
         atp->check_graphics_mode_ack();
 
-#ifdef __APPLE__    
         // If screensaver application has not responded to our request to exit MODE_FULLSCREEN after 
         // 2 seconds, then assume it has hung and kill it, so it doesn't block access to the computer.
         // First try an exit request.  If it has not exit after 2 more seconds, kill it.
@@ -216,7 +215,6 @@ void ACTIVE_TASK_SET::graphics_poll() {
                 }
             }
         }
-#endif
     }
 }
 
diff --git a/client/ss_logic.C b/client/ss_logic.C
index 17ee750b58..ae2b6141eb 100644
--- a/client/ss_logic.C
+++ b/client/ss_logic.C
@@ -94,9 +94,7 @@ void SS_LOGIC::reset() {
         scope_messages.printf("SS_LOGIC::reset(): resetting %s\n", atp->result->name);
         atp->request_graphics_mode(m);
         atp->is_ss_app = false;
-#ifdef __APPLE__
         atp->graphics_mode_ack_timeout = gstate.now;    // Set Mac screensaver safety timer
-#endif
     }
 }
 
diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings
index f736cd4dc7..c56a3a5b9e 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.3.31";
-CFBundleGetInfoString = "BOINC version 5.3.31, Copyright 2005 University of California.";
+CFBundleShortVersionString = "BOINC version 5.5.0";
+CFBundleGetInfoString = "BOINC version 5.5.0, Copyright 2005 University of California.";
diff --git a/mac_build/Info.plist b/mac_build/Info.plist
index ba631b52e2..4ea7f15013 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.3.31</string>
+	<string>5.5.0</string>
 </dict>
 </plist>
diff --git a/mac_build/Installer-Info.plist b/mac_build/Installer-Info.plist
index a21133de06..5537c9d95d 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.3.31</string>
+	<string>5.5.0</string>
 </dict>
 </plist>
diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist
index 7da91cdf5b..049ba2e656 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.3.31</string>
+	<string>5.5.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 e337597ccb..8e7a308cd0 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.3.31</string>
+	<string>5.5.0</string>
 </dict>
 </plist>