diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9cdf9b3a013..fb790a70682 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-14  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
+
+	* doc/contrib.texi (Contributors): Use Windows instead of Win32.
+
+	Update Andreas Jaeger's entry.
+
+	Merge the two entries of Kaveh Ghazi, David Edelsohn, and
+	Loren J. Rittle.
+
 2003-06-21  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* mkconfig.sh: Add multiple inclusion guards to generated headers.
diff --git a/gcc/doc/contrib.texi b/gcc/doc/contrib.texi
index 9a4a83d8a65..b716c364f8c 100644
--- a/gcc/doc/contrib.texi
+++ b/gcc/doc/contrib.texi
@@ -48,7 +48,7 @@ Scott Bambrough for help porting the Java compiler.
 Wolfgang Bangerth for processing tons of bug reports.
 
 @item
-Jon Beniston for his Win32 port of Java.
+Jon Beniston for his Windows port of Java.
 
 @item
 Daniel Berlin for better DWARF2 support, faster/better optimizations,
@@ -203,8 +203,9 @@ Richard Earnshaw for his ongoing work with the ARM@.
 
 @item
 David Edelsohn for his direction via the steering committee, ongoing work
-with the RS6000/PowerPC port, help cleaning up Haifa loop changes, and
-for doing the entire AIX port of libstdc++ with his bare hands.
+with the RS6000/PowerPC port, help cleaning up Haifa loop changes,
+doing the entire AIX port of libstdc++ with his bare hands, and for
+ensuring GCC properly keeps working on AIX.
 
 @item
 Kevin Ediger for the floating point formatting of num_put::do_put in
@@ -253,8 +254,9 @@ Ivan Fontes Garcia for the Portugese translation of the GCJ FAQ.
 Peter Gerwinski for various bug fixes and the Pascal front end.
 
 @item
-Kaveh Ghazi for his direction via the steering committee and
-amazing work to make @samp{-W -Wall} useful.
+Kaveh Ghazi for his direction via the steering committee,
+amazing work to make @samp{-W -Wall} useful, and continously testing
+GCC on a plethora of platforms.
 
 @item
 John Gilmore for a donation to the FSF earmarked improving GNU Java.
@@ -338,7 +340,7 @@ Kamil Iskra for general m68k hacking.
 Lee Iverson for random fixes and MIPS testing.
 
 @item
-Andreas Jaeger for various fixes to the MIPS port
+Andreas Jaeger for testing and benchmarking of GCC and various bug fixes.
 
 @item
 Jakub Jelinek for his SPARC work and sibling call optimizations as well
@@ -492,7 +494,7 @@ for Java test code.
 Bryce McKinlay for numerous GCJ and libgcj fixes and improvements.
 
 @item
-Adam Megacz for his work on the Win32 port of GCJ.
+Adam Megacz for his work on the Windows port of GCJ.
 
 @item
 Michael Meissner for LRS framework, ia32, m32r, v850, m88k, MIPS,
@@ -646,7 +648,8 @@ hacking.
 @item
 Loren J. Rittle for improvements to libstdc++-v3 including the FreeBSD
 port, threading fixes, thread-related configury changes, critical
-threading documentation, and solutions to really tricky I/O problems.
+threading documentation, and solutions to really tricky I/O problems,
+as well as keeping GCC properly working on FreeBSD and continuous testing.
 
 @item
 Craig Rodrigues for processing tons of bug reports.
@@ -942,9 +945,6 @@ Ralph Doncaster
 @item
 Ulrich Drepper
 
-@item
-David Edelsohn
-
 @item
 Richard Emberson
 
@@ -969,9 +969,6 @@ Charles-Antoine Gauthier
 @item
 Yung Shing Gene
 
-@item
-Kaveh Ghazi
-
 @item
 David Gilbert