diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index 050c547445..a1a5dbaf3a 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -40,10 +40,9 @@ class acp_update
 		$latest_version = trim($info[0]);
 
 		$announcement_url = trim($info[1]);
-		$update_archive_link = 'http://www.phpbb.com/files/releases/phpBB-' . $config['version'] . '_to_' . $latest_version . '.zip';
 		$update_link = append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update');
 
-		$up_to_date = (version_compare(strtolower($config['version']), strtolower($latest_version), '<')) ? false : true;
+		$up_to_date = (version_compare(str_replace('rc', 'RC', strtolower($config['version'])), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true;
 
 		$template->assign_vars(array(
 			'S_UP_TO_DATE'		=> $up_to_date,
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index ec90b4e205..10e4be3ac4 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -565,8 +565,8 @@ $db->sql_freeresult($result);
 echo $lang['PREVIOUS_VERSION'] . ' :: <strong>' . $config['version'] . '</strong><br />';
 echo $lang['UPDATED_VERSION'] . ' :: <strong>' . $updates_to_version . '</strong>';
 
-$current_version = strtolower($config['version']);
-$latest_version = strtolower($updates_to_version);
+$current_version = str_replace('rc', 'RC', strtolower($config['version']));
+$latest_version = str_replace('rc', 'RC', strtolower($updates_to_version));
 $orig_version = $config['version'];
 
 // If the latest version and the current version are 'unequal', we will update the version_update_from, else we do not update anything.
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index cd24444505..bc5ce0c57c 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -137,7 +137,7 @@ class install_update extends module
 		// For the current version we trick a bit. ;)
 		$this->current_version = (!empty($config['version_update_from'])) ? $config['version_update_from'] : $config['version'];
 
-		$up_to_date = (version_compare(strtolower($this->current_version), strtolower($this->latest_version), '<')) ? false : true;
+		$up_to_date = (version_compare(str_replace('rc', 'RC', strtolower($this->current_version)), str_replace('rc', 'RC', strtolower($this->latest_version), '<'))) ? false : true;
 
 		// Check for a valid update directory, else point the user to the phpbb.com website
 		if (!file_exists($phpbb_root_path . 'install/update') || !file_exists($phpbb_root_path . 'install/update/index.' . $phpEx) || !file_exists($this->old_location) || !file_exists($this->new_location))
@@ -154,7 +154,7 @@ class install_update extends module
 
 		// Make sure the update directory holds the correct information
 		// Since admins are able to run the update/checks more than once we only check if the current version is lower or equal than the version to which we update to.
-		if (version_compare(strtolower($this->current_version), strtolower($this->update_info['version']['to']), '>'))
+		if (version_compare(str_replace('rc', 'RC', strtolower($this->current_version)), str_replace('rc', 'RC', strtolower($this->update_info['version']['to'])), '>'))
 		{
 			$template->assign_vars(array(
 				'S_ERROR'		=> true,