diff --git a/ChangeLog b/ChangeLog
index 591327959..200cdea87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-31  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/gutils.c (g_get_any_init): (Win32) Use longer buffer for
+	user name.
+
 Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gspawn.c (script_execute): Copy trailing NULL
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 591327959..200cdea87 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-12-31  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/gutils.c (g_get_any_init): (Win32) Use longer buffer for
+	user name.
+
 Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gspawn.c (script_execute): Copy trailing NULL
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 591327959..200cdea87 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-12-31  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/gutils.c (g_get_any_init): (Win32) Use longer buffer for
+	user name.
+
 Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gspawn.c (script_execute): Copy trailing NULL
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 591327959..200cdea87 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2001-12-31  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/gutils.c (g_get_any_init): (Win32) Use longer buffer for
+	user name.
+
 Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gspawn.c (script_execute): Copy trailing NULL
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 591327959..200cdea87 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-12-31  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/gutils.c (g_get_any_init): (Win32) Use longer buffer for
+	user name.
+
 Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gspawn.c (script_execute): Copy trailing NULL
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 591327959..200cdea87 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-12-31  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/gutils.c (g_get_any_init): (Win32) Use longer buffer for
+	user name.
+
 Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gspawn.c (script_execute): Copy trailing NULL
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 591327959..200cdea87 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-12-31  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/gutils.c (g_get_any_init): (Win32) Use longer buffer for
+	user name.
+
 Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gspawn.c (script_execute): Copy trailing NULL
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 591327959..200cdea87 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-12-31  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/gutils.c (g_get_any_init): (Win32) Use longer buffer for
+	user name.
+
 Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gspawn.c (script_execute): Copy trailing NULL
diff --git a/glib/gutils.c b/glib/gutils.c
index 66891a128..29516d638 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -65,9 +65,10 @@
 #endif
 
 #ifdef G_PLATFORM_WIN32
-#  define STRICT			/* Strict typing, please */
+#  define STRICT		/* Strict typing, please */
 #  include <windows.h>
 #  undef STRICT
+#  include <lmcons.h>		/* For UNLEN */
 #  include <ctype.h>
 #endif /* G_PLATFORM_WIN32 */
 
@@ -868,8 +869,8 @@ g_get_any_init (void)
       
 #  ifdef G_OS_WIN32
       {
-	guint len = 17;
-	gchar buffer[17];
+	guint len = UNLEN+1;
+	gchar buffer[UNLEN+1];
 	
 	if (GetUserName ((LPTSTR) buffer, (LPDWORD) &len))
 	  {