diff --git a/CREDITS b/CREDITS
index c59babe74..f95260e84 100644
--- a/CREDITS
+++ b/CREDITS
@@ -35,6 +35,7 @@ Jim Knoble <jmknoble@pobox.com> - Many patches
 jonchen (email unknown) - the original author of PAM support of SSH
 Juergen Keil <jk@tools.de> - scp bugfixing
 Kees Cook <cook@cpoint.net> - scp fixes
+Kenji Miyake <kenji@miyake.org> - Configure fixes
 Kevin O'Connor <kevin_oconnor@standardandpoors.com> - RSAless operation
 Kiyokazu SUTO <suto@ks-and-ks.ne.jp> - Bugfixes
 Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes
diff --git a/ChangeLog b/ChangeLog
index 8da1f8226..662f9cbdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20000609
+ - (djm) Patch from Kenji Miyake <kenji@miyake.org> to disable utmp usage
+   (in favour of utmpx) on Solaris 8
+
 20000606
  - (djm) Cleanup of entropy.c. Reorganised code, removed second pass through
    list of commands (by default). Removed verbose debugging (by default).
diff --git a/configure.in b/configure.in
index a886fbbd6..9eb38393e 100644
--- a/configure.in
+++ b/configure.in
@@ -106,6 +106,15 @@ case "$host" in
 	need_dash_r=1
 	# hardwire lastlog location (can't detect it on some versions)
 	conf_lastlog_location="/var/adm/lastlog"
+	AC_MSG_CHECKING(for obsolete utmp and wtmp in solaris2.x)
+	sol2ver=`echo "$host"| sed -e 's/.*[[0-9]]\.//'`
+	if test "$sol2ver" -ge 8; then
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(DISABLE_UTMP)
+		AC_DEFINE(DISABLE_WTMP)
+	else
+		AC_MSG_RESULT(no)
+	fi
 	;;
 *-*-sunos4*)
 	CFLAGS="$CFLAGS -DSUNOS4"