diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d6c781ea634..e28cc6e12ee 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2005-02-18  Anthony Green  <green@redhat.com>
+
+	* gij.cc (version): Change year for '--version' to 2005.
+	* gnu/gcj/convert/Convert.java: Ditto.
+	* gnu/java/rmi/rmic/RMIC.java: Ditto.
+	* gnu/java/rmi/registry/RegistryImpl.java: Ditto.
+
+	* gnu/gcj/tools/gcj_dbtool/Main.java: Only show the most
+	recent copyright year in `--version' output.
+
 2005-02-18  Robert Schuster <thebohemian@gmx.net>
 
 	* java/nio/charset/Charset.java (forName): Throws
diff --git a/libjava/gij.cc b/libjava/gij.cc
index 64457857a13..1894d9b9c96 100644
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -47,7 +47,7 @@ static void
 version ()
 {
   printf ("gij (GNU libgcj) version %s\n\n", __VERSION__);
-  printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n");
+  printf ("Copyright (C) 2005 Free Software Foundation, Inc.\n");
   printf ("This is free software; see the source for copying conditions.  There is NO\n");
   printf ("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
 }
diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java
index 3b2add6ef42..5d4a314d609 100644
--- a/libjava/gnu/gcj/convert/Convert.java
+++ b/libjava/gnu/gcj/convert/Convert.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2002  Free Software Foundation
+/* Copyright (C) 1999, 2002, 2005  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -45,7 +45,7 @@ public class Convert
 		       + ") "
 		       + System.getProperty("java.vm.version"));
     System.out.println();
-    System.out.println("Copyright (C) 2002 Free Software Foundation, Inc.");
+    System.out.println("Copyright (C) 2005 Free Software Foundation, Inc.");
     System.out.println("This is free software; see the source for copying conditions.  There is NO");
     System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
     System.exit(0);
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
index 256b6196df5..ea8f35cf3f4 100644
--- a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
+++ b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
@@ -31,7 +31,7 @@ public class Main
 			   + ") "
 			   + System.getProperty("java.vm.version"));
 	System.out.println();
-	System.out.println("Copyright 2004, 2005 Free Software Foundation, Inc.");
+	System.out.println("Copyright 2005 Free Software Foundation, Inc.");
 	System.out.println("This is free software; see the source for copying conditions.  There is NO");
 	System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 	return;
diff --git a/libjava/gnu/java/rmi/registry/RegistryImpl.java b/libjava/gnu/java/rmi/registry/RegistryImpl.java
index 007d5a97de9..43033c4b8ad 100644
--- a/libjava/gnu/java/rmi/registry/RegistryImpl.java
+++ b/libjava/gnu/java/rmi/registry/RegistryImpl.java
@@ -1,5 +1,6 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005
+  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -109,7 +110,7 @@ public static void version() {
 			   + System.getProperty("java.vm.name")
 			   + ") "
 			   + System.getProperty("java.vm.version"));
-	System.out.println("Copyright 2002 Free Software Foundation, Inc.");
+	System.out.println("Copyright 2005 Free Software Foundation, Inc.");
 	System.out.println("This is free software; see the source for copying conditions.  There is NO");
 	System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 	System.exit(0);
diff --git a/libjava/gnu/java/rmi/rmic/RMIC.java b/libjava/gnu/java/rmi/rmic/RMIC.java
index e81c0fb780b..0976cd279b2 100644
--- a/libjava/gnu/java/rmi/rmic/RMIC.java
+++ b/libjava/gnu/java/rmi/rmic/RMIC.java
@@ -1,5 +1,5 @@
 /* RMIC.java --
-   Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
+   Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -978,7 +978,7 @@ public class RMIC
 	    System.out.println("rmic (" + System.getProperty("java.vm.name")
 	                       + ") " + System.getProperty("java.vm.version"));
 	    System.out.println();
-	    System.out.println("Copyright 2002 Free Software Foundation, Inc.");
+	    System.out.println("Copyright 2005 Free Software Foundation, Inc.");
 	    System.out.println("This is free software; see the source for copying conditions.  There is NO");
 	    System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 	    System.exit(0);