diff --git a/check.t b/check.t
index 8956a1e..af256a6 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.466 2011/06/11 03:14:47 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.467 2011/06/12 14:58:43 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 R40 2011/06/10
+	@(#)MIRBSD KSH R40 2011/06/12
 description:
 	Check version of shell.
 stdin:
diff --git a/sh.h b/sh.h
index a5eeb80..3887aea 100644
--- a/sh.h
+++ b/sh.h
@@ -151,9 +151,9 @@
 #endif
 
 #ifdef EXTERN
-__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.475 2011/06/11 03:14:50 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.476 2011/06/12 14:58:45 tg Exp $");
 #endif
-#define MKSH_VERSION "R40 2011/06/10"
+#define MKSH_VERSION "R40 2011/06/12"
 
 #ifndef MKSH_INCLUDES_ONLY
 
@@ -1435,8 +1435,8 @@ EXTERN int histsize;	/* history size */
 /* user and system time of last j_waitjed job */
 EXTERN struct timeval j_usrtime, j_systime;
 
-#define notoktomul(fac1, fac2)	((fac1) && (fac2) && \
-				    (SIZE_MAX / (fac1) < (fac2)))
+#define notoktomul(fac1, fac2)	(((fac1) != 0) && ((fac2) != 0) && \
+				    ((SIZE_MAX / (fac1)) < (fac2)))
 #define notoktoadd(val, cnst)	((val) > (SIZE_MAX - (cnst)))
 #define checkoktoadd(val, cnst) do {					\
 	if (notoktoadd((val), (cnst)))					\