Index: doc/Changelog
===================================================================
--- doc/Changelog.orig	2010-04-11 11:30:27.000000000 +0200
+++ doc/Changelog	2010-05-12 13:26:34.679992111 +0200
@@ -35,6 +35,8 @@ sysvinit (2.88dsf) world; urgency=low
     get binaries with debug information installed.
 
   [ Werner Fink ]
+  * Correct fix for Debian bug #547073: use IUTF8 flag if defined
+    and if already set.
   * Add the comment from Andrea Arcangeli about the correct
     place of setting the default childhandler within spawn().
   * Make sure that newline is printed out for last(1) even
Index: src/init.c
===================================================================
--- src/init.c.orig	2010-05-12 13:24:29.000000000 +0200
+++ src/init.c	2010-05-12 13:24:44.536090878 +0200
@@ -788,10 +788,11 @@ void console_stty(void)
 	/*
 	 *	Set pre and post processing
 	 */
-	tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY;
-#ifdef IUTF8 /* Not defined on FreeBSD */
-	tty.c_iflag |= IUTF8;
+	tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY
+#ifdef IUTF8	/* Not defined on FreeBSD */
+			| (tty.c_iflag & IUTF8)
 #endif /* IUTF8 */
+		;
 	tty.c_oflag = OPOST|ONLCR;
 	tty.c_lflag = ISIG|ICANON|ECHO|ECHOCTL|ECHOPRT|ECHOKE;
 
Index: src/sulogin.c
===================================================================
--- src/sulogin.c.orig	2010-04-08 11:07:36.000000000 +0200
+++ src/sulogin.c	2010-05-12 13:24:44.576090860 +0200
@@ -101,9 +101,6 @@ void fixtty(void)
 	 * the same result as `stty sane cr0 pass8'
 	 */
 	tty.c_iflag |=  (BRKINT | ICRNL | IMAXBEL);
-#ifdef IUTF8 /* Not defined on FreeBSD */
-	tty.c_iflag |= IUTF8;
-#endif /* IUTF8 */
 	tty.c_iflag &= ~(IGNBRK | INLCR | IGNCR | IXOFF | IUCLC | IXANY | ISTRIP);
 	tty.c_oflag |=  (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0);
 	tty.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL |\