diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 661762da389..704904aa44f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-04-19  Tom Tromey  <tromey@cygnus.com>
+
+	* java/lang/natSystem.cc (init_properties): Only declare pwd_entry
+	once.  From Anthony Green.
+
 1999-04-19  Andrew Haley  <aph@cygnus.com>
 
 	* Makefile.in: Processed with new automake.
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index 10acfceafa3..27034ff2047 100644
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -276,7 +276,7 @@ java::lang::System::init_properties (void)
       buf_r = (char *) _Jv_AllocBytes (len_r);
     }
 #else
-  struct passwd *pwd_entry = getpwuid (user_id);
+  pwd_entry = getpwuid (user_id);
 #endif /* HAVE_GETPWUID_R */
 
   if (pwd_entry != NULL)