diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 70f9e946ee..a62dcc6af2 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* gdbreplay.c (gdbreplay_version): Say gdbreplay in version
+	message, not gdbserver.
+
 2008-06-05  Vladimir Prus  <vladimir@codesourcery.com>
             Nathan Sidwell  <nathan@codesourcery.com>
             Joseph Myers  <joseph@codesourcery.com>
diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
index d54ed1dc33..f0e83b6d91 100644
--- a/gdb/gdbserver/gdbreplay.c
+++ b/gdb/gdbserver/gdbreplay.c
@@ -396,8 +396,8 @@ gdbreplay_version (void)
 {
   printf ("GNU gdbreplay %s%s\n"
 	  "Copyright (C) 2008 Free Software Foundation, Inc.\n"
-	  "gdbserver is free software, covered by the GNU General Public License.\n"
-	  "This gdbserver was configured as \"%s\"\n",
+	  "gdbreplay is free software, covered by the GNU General Public License.\n"
+	  "This gdbreplay was configured as \"%s\"\n",
 	  PKGVERSION, version, host_name);
 }