diff --git a/include/utmp.h b/include/utmp.h
index 74df997334b1..d1007fb5369f 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
- *	$Id$
+ *	$Id: utmp.h,v 1.2 1996/10/27 18:13:35 wosch Exp $
  */
 
 #ifndef	_UTMP_H_
@@ -46,7 +46,7 @@
 #define	_PATH_WTMP	"/var/log/wtmp"
 #define	_PATH_LASTLOG	"/var/log/lastlog"
 
-#define	UT_NAMESIZE	8	/* see MAXLOGNAME in <sys/param.h> */
+#define	UT_NAMESIZE	16	/* see MAXLOGNAME in <sys/param.h> */
 #define	UT_LINESIZE	8
 #define	UT_HOSTSIZE	16
 
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index 508975621ad0..4e73c3802218 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -72,7 +72,7 @@ or the script
 #define _PATH_WTMP      "/var/log/wtmp"
 #define _PATH_LASTLOG   "/var/log/lastlog"
 
-#define UT_NAMESIZE     8
+#define UT_NAMESIZE     16
 #define UT_LINESIZE     8
 #define UT_HOSTSIZE     16
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 60a16ac0c91e..e5b3d380a14c 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $Id: param.h,v 1.16 1996/11/28 04:07:44 dyson Exp $
+ * $Id: param.h,v 1.17 1996/11/30 22:41:35 dyson Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -65,7 +65,7 @@
 
 #define	MAXCOMLEN	16		/* max command name remembered */
 #define	MAXINTERP	32		/* max interpreter file name length */
-#define	MAXLOGNAME	12		/* max login name length */
+#define	MAXLOGNAME	16		/* max login name length */
 #define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
 #define	NCARGS		ARG_MAX		/* max bytes for an exec function */
 #define	NGROUPS		NGROUPS_MAX	/* max number groups */