diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ae0e407fb36..f5684617052 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-08  Tom Tromey  <tromey@redhat.com>
+
+	* gcj.texi (libgcj Runtime Properties): Document
+	gnu.gcj.user.realname.
+
 2006-06-08  Andrew Haley  <aph@redhat.com>
 
 	* expr.c (build_field_ref): Pass NULL_TREE as SPECIAL arg to
diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi
index 38ae1abeaac..70acd7c8043 100644
--- a/gcc/java/gcj.texi
+++ b/gcc/java/gcj.texi
@@ -2785,6 +2785,12 @@ the name of the "main" class in the case where the @code{gij} front end is
 used, or the program binary name in the case where an application is compiled 
 to a native binary.
 
+@item gnu.gcj.user.realname
+The real name of the user, as taken from the password file.  This may
+not always hold only the user's name (as some sites put extra
+information in this field).  Also, this property is not available on
+all platforms.
+
 @item gnu.gcj.runtime.NameFinder.use_addr2line
 Whether an external process, @command{addr2line}, should be used to determine
 line number information when tracing the stack. Setting this to @code{false} 
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b9b30dacc78..b08cf783588 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-08  Tom Tromey  <tromey@redhat.com>
+
+	* gnu/classpath/natSystemProperties.cc (insertSystemProperties):
+	Set gnu.gcj.user.realname.
+
 2006-06-09  Andreas Tobler  <a.tobler@schweiz.ch>
 
 	* scripts/jar.in: Replace hardcoded /bin/sh with @SHELL@.
diff --git a/libjava/gnu/classpath/natSystemProperties.cc b/libjava/gnu/classpath/natSystemProperties.cc
index 2a39e079b8a..9f77a1790c3 100644
--- a/libjava/gnu/classpath/natSystemProperties.cc
+++ b/libjava/gnu/classpath/natSystemProperties.cc
@@ -1,7 +1,7 @@
 // natSystemProperties.cc - Implementation of native side of
 // SystemProperties class.
 
-/* Copyright (C) 2005  Free Software Foundation
+/* Copyright (C) 2005, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -250,6 +250,7 @@ gnu::classpath::SystemProperties::insertSystemProperties (java::util::Properties
     {
       SET ("user.name", pwd_entry->pw_name);
       SET ("user.home", pwd_entry->pw_dir);
+      SET ("gnu.gcj.user.realname", pwd_entry->pw_gecos);
     }
 #endif /* HAVE_PWD_H */
 #endif /* NO_GETUID */