diff --git a/ChangeLog b/ChangeLog
index e6ba2ed31..512fbc7e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20100622
+ - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512
+   bz#1579; ok dtucker
+
 20100618
  - (djm) [contrib/ssh-copy-id] Update key file explicitly under ~
    rather than assuming that $CWD == $HOME. bz#1500, patch from
diff --git a/loginrec.h b/loginrec.h
index 859e1a630..84b486590 100644
--- a/loginrec.h
+++ b/loginrec.h
@@ -56,7 +56,7 @@ union login_netinfo {
 /* string lengths - set very long */
 #define LINFO_PROGSIZE 64
 #define LINFO_LINESIZE 64
-#define LINFO_NAMESIZE 128
+#define LINFO_NAMESIZE 512
 #define LINFO_HOSTSIZE 256
 
 struct logininfo {