diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 43d51505885..18044e91ad2 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4616,10 +4616,10 @@ $wgCategoryPagingLimit = 200;
  * for all rows where cl_collation != $wgCategoryCollation and regenerates
  * cl_sortkey based on the page name and cl_sortkey_prefix.
  *
- * Currently only supports 'uppercase', which just uppercases the string.  This
+ * Currently only supports 'uppercase2', which just uppercases the string.  This
  * is a dummy collation, to be replaced later by real ones.
  */
-$wgCategoryCollation = 'uppercase';
+$wgCategoryCollation = 'uppercase2';
 
 /** @} */ # End categories }
 
diff --git a/languages/Language.php b/languages/Language.php
index 62a2b119546..1d3528fac55 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3010,7 +3010,7 @@ class Language {
 	 */
 	public function convertToSortkey( $string ) {
 		# Fake function for now
-		return strtoupper( $string );
+		return $this->uc( $string );
 	}
 
 	/**
@@ -3040,6 +3040,6 @@ class Language {
 		if ( $string[0] == "\0" ) {
 			$string = substr( $string, 1 );
 		}
-		return strtoupper( $this->firstChar( $string ) );
+		return $this->uc( $this->firstChar( $string ) );
 	}
 }
diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 67b6b1002ae..9e8dd3306e4 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -80,7 +80,7 @@ TEXT;
 			$dbw->begin();
 			foreach ( $res as $row ) {
 				$title = Title::newFromRow( $row );
-				if ( $row->cl_collation == 0 ) {
+				if ( !$row->cl_collation ) {
 					# This is an old-style row, so the sortkey needs to be
 					# converted.
 					if ( $row->cl_sortkey == $title->getText()