diff --git a/ChangeLog b/ChangeLog
index ce094d987..877ad78e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr 13 21:00:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSUser.m: Implemented NSFullUserName()
+
 Mon Apr 12 13:15:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSCountedSet.m: Make copying behavior be same as OPENSTEP
diff --git a/Source/NSUser.m b/Source/NSUser.m
index aeeaafb3e..9cb7276a5 100644
--- a/Source/NSUser.m
+++ b/Source/NSUser.m
@@ -37,6 +37,8 @@
 #include <stdlib.h>		// for getenv()
 #if !defined(__WIN32__) && !defined(_WIN32)
 #include <unistd.h>		// for getlogin()
+#endif
+#if	HAVE_PWD_H
 #include <pwd.h>		// for getpwnam()
 #endif
 #include <sys/types.h>
@@ -143,8 +145,15 @@ NSHomeDirectoryForUser (NSString *login_name)
 
 NSString *NSFullUserName(void)
 {
+#if HAVE_PWD_H
+  struct passwd	*pw;
+
+  pw = getpwnam([NSUserName() cString]);
+  return [NSString stringWithCString: pw->pw_gecos];
+#else
   NSLog(@"Warning: NSFullUserName not implemented\n");
   return NSUserName();
+#endif
 }
 
 NSArray *NSStandardApplicationPaths(void)