diff --git a/ChangeLog b/ChangeLog
index 7cb438324..86ca9c789 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    pty name on Linux 2.6.x systems.  Patch from jpe at eisenmenger.org.
  - (bal) [monitor.c monitor_wrap.c] Second try.  Put the zlib.h headers
    back and #undef TARGET_OS_MAC instead.  (Bug report pending with Apple)
+ - (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and
+   simplify loginrec.c.  ok tim@
 
 20040407
  - (dtucker) [session.c] Flush stdout after displaying loginmsg.  From
@@ -953,4 +955,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.3305 2004/04/08 05:11:03 mouring Exp $
+$Id: ChangeLog,v 1.3306 2004/04/08 06:16:06 dtucker Exp $
diff --git a/defines.h b/defines.h
index 006f487f6..a4fdd2c83 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.112 2004/04/06 11:31:13 dtucker Exp $ */
+/* $Id: defines.h,v 1.113 2004/04/08 06:16:06 dtucker Exp $ */
 
 
 /* Constants */
@@ -615,6 +615,10 @@ struct winsize {
 
 #endif
 
+#ifndef UT_LINESIZE
+# define UT_LINESIZE 8
+#endif
+
 /* I hope that the presence of LASTLOG_FILE is enough to detect this */
 #if defined(LASTLOG_FILE) && !defined(DISABLE_LASTLOG)
 #  define USE_LASTLOG
diff --git a/loginrec.c b/loginrec.c
index 9a9ad66a0..b74d412e6 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -158,7 +158,7 @@
 #include "log.h"
 #include "atomicio.h"
 
-RCSID("$Id: loginrec.c,v 1.55 2004/04/08 00:57:05 dtucker Exp $");
+RCSID("$Id: loginrec.c,v 1.56 2004/04/08 06:16:06 dtucker Exp $");
 
 #ifdef HAVE_UTIL_H
 #  include <util.h>
@@ -1354,11 +1354,7 @@ static int
 syslogin_perform_logout(struct logininfo *li)
 {
 # ifdef HAVE_LOGOUT
-# ifdef UT_LINESIZE
 	char line[UT_LINESIZE];
-# else
-	char line[8];
-# endif
 
 	(void)line_stripname(line, li->line, sizeof(line));