diff --git a/check.t b/check.t
index 8d72d55..6ac3d66 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.445 2011/04/09 18:47:12 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.446 2011/04/17 12:24:42 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 $
@@ -25,7 +25,7 @@
 # http://www.research.att.com/~gsf/public/ifs.sh
 
 expected-stdout:
-	@(#)MIRBSD KSH R39 2011/04/09
+	@(#)MIRBSD KSH R39 2011/04/17
 description:
 	Check version of shell.
 stdin:
diff --git a/main.c b/main.c
index afb3f8a..d532ea3 100644
--- a/main.c
+++ b/main.c
@@ -33,7 +33,7 @@
 #include <locale.h>
 #endif
 
-__RCSID("$MirOS: src/bin/mksh/main.c,v 1.189 2011/04/09 21:01:02 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/main.c,v 1.190 2011/04/17 12:24:43 tg Exp $");
 
 extern char **environ;
 
@@ -550,13 +550,14 @@ main(int argc, const char *argv[])
 	}
 	Flag(FERREXIT) = errexit;
 
-	if (Flag(FTALKING)) {
+	if (Flag(FTALKING))
 		hist_init(s);
-		alarm_init();
-	} else
+	else
 		/* set after ENV */
 		Flag(FTRACKALL) = 1;
 
+	alarm_init();
+
 	if (Flag(FAS_BUILTIN))
 		return (shcomexec(l->argv));
 
diff --git a/sh.h b/sh.h
index 5982c12..9313fba 100644
--- a/sh.h
+++ b/sh.h
@@ -151,9 +151,9 @@
 #endif
 
 #ifdef EXTERN
-__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.462 2011/04/09 21:01:03 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.463 2011/04/17 12:24:44 tg Exp $");
 #endif
-#define MKSH_VERSION "R39 2011/04/09"
+#define MKSH_VERSION "R39 2011/04/17"
 
 #ifndef MKSH_INCLUDES_ONLY