diff --git a/ChangeLog b/ChangeLog
index 3ce1407..7387414 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
    - dtucker@cvs.openbsd.org 2005/11/29 02:04:55
      [ssh-keygen.c]
      Populate default key sizes before checking them; from & ok tim@
+ - (tim) [configure.ac sshd.8] Enable locked account check (a "*LK*" string)
+   for UnixWare.
 
 20051128
  - (dtucker) [regress/yes-head.sh] Work around breakage caused by some
@@ -3383,4 +3385,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4014 2005/11/29 02:10:24 dtucker Exp $
+$Id: ChangeLog,v 1.4015 2005/11/29 02:40:34 tim Exp $
diff --git a/configure.ac b/configure.ac
index ffa94e86..0afb487 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.311 2005/11/26 11:24:10 dtucker Exp $
+# $Id: configure.ac,v 1.312 2005/11/29 02:40:34 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -434,6 +434,7 @@
 	AC_DEFINE(BROKEN_SETREUID)
 	AC_DEFINE(BROKEN_SETREGID)
 	AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd])
+	AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
 	;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
@@ -450,6 +451,8 @@
 		AC_DEFINE(BROKEN_LIBIAF, 1,
 			[ia_uinfo routines not supported by OS yet])
 		;;
+	*)	AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
+		;;
 	esac
 	;;
 *-*-sysv*)
diff --git a/sshd.8 b/sshd.8
index 94cefde..c610f47 100644
--- a/sshd.8
+++ b/sshd.8
@@ -119,7 +119,7 @@
 \&.  The definition of a locked account is system dependant. Some platforms
 have their own account database (eg AIX) and some modify the passwd field (
 .Ql \&*LK\&*
-on Solaris,
+on Solaris and UnixWare,
 .Ql \&*
 on HP-UX, containing
 .Ql Nologin