diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 06db22a7c..309bcb267 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 30 20:26:00 2001  Corinna Vinschen <corinna@vinschen.de>
+
+	* uinfo.cc (internal_getlogin): Formatting change.
+
 Mon Apr 30 19:58:00 2001  Corinna Vinschen <corinna@vinschen.de>
 
 	* grp.cc: Eliminate MAX_DOMAIN_NAME define.
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index 3706e4a7d..65e06bc18 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -61,11 +61,12 @@ internal_getlogin (cygheap_user &user)
       /* If that failed, try to get that info from NetBIOS */
       else if (!NetWkstaUserGetInfo (NULL, 1, (LPBYTE *)&wui))
 	{
-	  char buf[512];
+	  char buf[512]; /* Bigger than each of the below defines. */
 
 	  sys_wcstombs (buf, wui->wkui1_username, UNLEN + 1);
 	  user.set_name (buf);
-	  sys_wcstombs (buf, wui->wkui1_logon_server, INTERNET_MAX_HOST_NAME_LENGTH + 1);
+	  sys_wcstombs (buf, wui->wkui1_logon_server,
+	  		INTERNET_MAX_HOST_NAME_LENGTH + 1);
 	  user.set_logsrv (buf);
 	  sys_wcstombs (buf, wui->wkui1_logon_domain,
 			INTERNET_MAX_HOST_NAME_LENGTH + 1);