--- TYPO3\typo3_src-4.7.4/t3lib/config_default.php	2012-08-15 12:48:25.000000000 +0200
+++ TYPO3\typo3_src-4.7.4_PATCHED/t3lib/config_default.php	2012-10-04 18:12:13.000000000 +0200
@@ -834,23 +834,23 @@
 		unset($TYPO3_CONF_VARS['BE']['forceCharset']);
 	}
 }
 
 if (isset($TYPO3_CONF_VARS['SYS']['setDBinit']) &&
 	$TYPO3_CONF_VARS['SYS']['setDBinit'] !== '-1' &&
-	preg_match('/SET NAMES utf8/', $TYPO3_CONF_VARS['SYS']['setDBinit']) === FALSE &&
+	preg_match('/SET NAMES/i', $TYPO3_CONF_VARS['SYS']['setDBinit']) > 0 &&
 	TYPO3_enterInstallScript !== '1'
 ) {
 		// Only accept "SET NAMES utf8" for this setting, otherwise die with a nice error
 	die('This TYPO3 installation is using the $TYPO3_CONF_VARS[\'SYS\'][\'setDBinit\'] property with the following value:' . chr(10) .
 		$TYPO3_CONF_VARS['SYS']['setDBinit'] . chr(10) . chr(10) .
-		'It looks like UTF-8 is not used for this connection.' . chr(10) . chr(10) .
-		'Everything other than UTF-8 is unsupported since TYPO3 4.7.' . chr(10) .
-		'The DB, its connection and TYPO3 should be migrated to UTF-8 therefore. Please check your setup.');
+		'SET NAMES defaults to UTF-8 since TYPO3 4.7 and changing its value is not supported anymore.' . chr(10) .
+		'Using SET NAMES in [\'SYS\'][\'setDBinit\'] is therefore not allowed.' . chr(10) .
+		'The DB, its connection and your TYPO3 installation should be migrated to UTF-8. Please check your setup.');
 } else {
-	$TYPO3_CONF_VARS['SYS']['setDBinit'] = 'SET NAMES utf8;';
+	$TYPO3_CONF_VARS['SYS']['setDBinit'] .=  LF . 'SET NAMES utf8;';
 }