Index: wp-admin/install.php
===================================================================
--- wp-admin/install.php	(revision 22132)
+++ wp-admin/install.php	(working copy)
@@ -175,6 +175,17 @@
 <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
 <p><?php printf( __( 'Welcome to the famous five minute WordPress installation process! You may want to browse the <a href="%s">ReadMe documentation</a> at your leisure. Otherwise, just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ), '../readme.html' ); ?></p>
 
+<?php
+	// Check if the in wp-config set encoding is supported by the database
+	$encoding_issue = false;
+	$wpdb->query("SHOW CHARACTER SET WHERE `Charset` = '".DB_CHARSET."';");
+	if($wpdb->num_rows==0) {
+		echo "<h1>".__( 'Database collation issue' )."</h1>\n";
+		echo "<p>".sprintf( __('The charset <i>%s</i> set in wp-config.php, is not available in your database.'), DB_CHARSET )."</p>\n";
+		break;
+	}
+?>
+
 <h1><?php _e( 'Information needed' ); ?></h1>
 <p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p>