diff --git a/ChangeLog b/ChangeLog
index 6574329dd..bb51a0a0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	* Source/NSString.m: ([stringByAddingPercentEscapesUsingEncoding:])
 	Fix to escape '@' (in fact anything not unreserved acording to
 	RFC2396)
+	* Source/NSPathUtilities.m: Fix missing include.
 
 2006-09-21  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/NSPathUtilities.m b/Source/NSPathUtilities.m
index 7d516e7ff..250a4378f 100644
--- a/Source/NSPathUtilities.m
+++ b/Source/NSPathUtilities.m
@@ -119,6 +119,9 @@ static NSString	*gnustep_flattened =
 #endif
 
 #if	defined(__MINGW32__)
+
+#include	<lmaccess.h>
+
 /*
  * FIXME ... should check access properly if the file is on an NTFS volume.
  */
@@ -1138,8 +1141,8 @@ NSFullUserName(void)
 #if defined(__MINGW32__)
       struct _USER_INFO_2	*userInfo;
 
-      NSString			*userName = NSUserName();
-      if (NetUserGetInfo(NULL, UniBuf(userName), 2, (LPBYTE*)&userInfo) == 0)
+      if (NetUserGetInfo(NULL, (unichar*)[userName cStringUsingEncoding:
+	NSUnicodeStringEncoding], 2, (LPBYTE*)&userInfo) == 0)
 	{
 	  userName = [NSString stringWithCharacters: userInfo->usri2_full_name
 	    length: wcslen(userInfo->usri2_full_name)];