--- /etc/rc.sysinit.orig	2006-12-08 14:39:31.000000000 +0200
+++ /etc/rc.sysinit	2006-12-08 14:48:34.000000000 +0200
@@ -244,7 +244,6 @@
 	/usr/bin/kbd_mode -u
 	/usr/bin/dumpkeys | /bin/loadkeys --unicode
 	# the $CONSOLE check helps us avoid this when running scripts from cron
-	echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a isatty ]; then echo -ne "\e%G"; fi' >>/etc/profile.d/locale.sh
 	stat_done
 fi
 
@@ -258,9 +257,25 @@
 		fi
 	done
 	# the $CONSOLE check helps us avoid this when running scripts from cron
-	echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a isatty ]; then echo -ne "\e(K"; fi' >>/etc/profile.d/locale.sh
 	stat_done
 fi
+
+echo <<<EOD
+if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a isatty ]; then
+	if [ "`echo $LANG | /bin/grep -i utf`" ]; then
+		echo -ne "\e%G";
+	else
+		echo -ne "\e(K";
+		G_BROKEN_FILENAMES=1
+		export G_BROKEN_FILENAMES
+		G_FILENAME_ENCODING=@locale
+		export G_FILENAME_ENCODING
+	fi
+fi
+EOD
+>>/etc/profile.d/locale.sh
+
+
 # Adding persistent network/cdrom generated rules
 if [ -f "/dev/.udev/tmp-rules--70-persistent-cd.rules" ]; then
 	stat_busy "Adding persistent cdrom udev rules"