diff --git a/check.t b/check.t
index 4dbdee2..2f59ca3 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.68 2006/11/05 12:11:13 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.69 2006/11/05 17:01:46 tg Exp $
 # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@@ -3872,5 +3872,5 @@ category: pdksh
 stdin:
 	echo $KSH_VERSION
 expected-stdout:
-	@(#)MIRBSD KSH R28 2006/11/05
+	@(#)MIRBSD KSH R29 2006/11/05
 ---
diff --git a/misc.c b/misc.c
index a94b4a9..6ec1468 100644
--- a/misc.c
+++ b/misc.c
@@ -3,7 +3,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.17 2006/11/05 12:11:14 tg Exp $\t"
+__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.18 2006/11/05 17:01:46 tg Exp $\t"
 	MKSH_SH_H_ID);
 
 short chtypes[UCHAR_MAX+1];	/* type bits for unsigned char */
@@ -142,7 +142,7 @@ const struct option options[] = {
 	{ "sh",		  0,		OF_ANY }, /* non-standard */
 	{ "stdin",	's',	    OF_CMDLINE }, /* pseudo non-standard */
 	{ "trackall",	'h',		OF_ANY },
-	{ "utf8-hack",	  0,		OF_ANY }, /* non-standard */
+	{ "utf8-hack",	'U',		OF_ANY }, /* non-standard */
 	{ "verbose",	'v',		OF_ANY },
 	{ "vi",		  0,		OF_ANY },
 	{ "viraw",	  0,		OF_ANY }, /* no effect */
diff --git a/mksh.1 b/mksh.1
index b01db9f..62db8d1 100644
--- a/mksh.1
+++ b/mksh.1
@@ -1,4 +1,4 @@
-.\" $MirOS: src/bin/mksh/mksh.1,v 1.59 2006/09/13 16:14:29 tg Exp $
+.\" $MirOS: src/bin/mksh/mksh.1,v 1.60 2006/11/05 17:01:46 tg Exp $
 .\" $OpenBSD: ksh.1,v 1.116 2006/07/26 10:13:25 jmc Exp $
 .\"
 .Dd September 13, 2006
@@ -11,7 +11,7 @@
 .Sh SYNOPSIS
 .Nm
 .Bk -words
-.Op Fl +abCefhiklmnpruvXx
+.Op Fl +abCefhiklmnprUuvXx
 .Op Fl T Ar /dev/ttyCn
 .Op Fl +o Ar option
 .Oo Fl c Ar string \*(Ba Fl s \*(Ba
@@ -3265,6 +3265,19 @@ the positional parameters (or to array
 if
 .Fl A
 is used).
+.It Fl U \(*Ba Ic utf8-hack
+Enable an experimental UTF-8 hack for the
+.Sx Emacs editing mode .
+This is enabled automatically if your system supports these two calls and
+.Fn setlocale LC_CTYPE \&""
+or an afterwards
+.Fn nl_langinfo CODESET
+return something that matches to
+.Dq UTF-8 ,
+.Dq utf8 ,
+.Dq CESU-8 ,
+or
+.Dq cesu8 .
 .It Fl u \*(Ba Ic nounset
 Referencing of an unset parameter is treated as an error, unless one of the
 .Ql - ,
diff --git a/sh.h b/sh.h
index 705a18a..26097d3 100644
--- a/sh.h
+++ b/sh.h
@@ -8,8 +8,8 @@
 /*	$OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $	*/
 /*	$OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $	*/
 
-#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.49 2006/11/05 15:31:37 tg Exp $"
-#define MKSH_VERSION "R28 2006/11/05"
+#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.50 2006/11/05 17:01:47 tg Exp $"
+#define MKSH_VERSION "R29 2006/11/05"
 
 #include <sys/cdefs.h>
 #if !defined(__RCSID) || !defined(__SCCSID)
@@ -283,7 +283,7 @@ enum sh_flag {
 	FSH,		/* -o sh (dummy, for pdksh compatibility) */
 	FSTDIN,		/* -s: (invocation) parse stdin */
 	FTRACKALL,	/* -h: create tracked aliases for all commands */
-	FUTFHACK,	/* utf-8 hack for command line editing */
+	FUTFHACK,	/* -U: utf-8 hack for command line editing */
 	FVERBOSE,	/* -v: echo input */
 	FVI,		/* vi command editing */
 	FVIRAW,		/* always read in raw mode (ignored) */