--- a/lib/ChangeLog	Mon Jul 11 19:13:35 2005 +0000
+++ b/lib/ChangeLog	Mon Jul 11 21:58:02 2005 +0000
@@ -1,3 +1,11 @@
+2005-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* version-etc-fsf.c (version_etc_copyright): Parameterize the
+	copyright symbol and the year.
+	* version-etc.c (COPYRIGHT_YEAR): New constant.
+	(version_etc_va): Use parameterized copyright notice.
+	Reword to conform to the current GNU coding standards.
+
 2005-07-11  Simon Josefsson  <jas@extundo.com>
 
 	* size_max.h: New file.

--- a/lib/version-etc-fsf.c	Mon Jul 11 19:13:35 2005 +0000
+++ b/lib/version-etc-fsf.c	Mon Jul 11 21:58:02 2005 +0000
@@ -27,5 +27,7 @@
 /* Default copyright goes to the FSF. */
 
 const char version_etc_copyright[] =
-  /* Do *not* mark this string for translation.  */
-  "Copyright (C) 2005 Free Software Foundation, Inc.";
+  /* Do *not* mark this string for translation.  %s is a copyright
+     symbol suitable for this locale, and %d is the copyright
+     year.  */
+  "Copyright %s %d Free Software Foundation, Inc.";

--- a/lib/version-etc.c	Mon Jul 11 19:13:35 2005 +0000
+++ b/lib/version-etc.c	Mon Jul 11 21:58:02 2005 +0000
@@ -35,6 +35,8 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
+enum { COPYRIGHT_YEAR = 2005 };
+
 /* Like version_etc, below, but with the NULL-terminated author list
    provided via a variable of type va_list.  */
 void
@@ -64,6 +66,20 @@
   else
     fprintf (stream, "%s %s\n", package, version);
 
+  /* TRANSLATORS: Translate "(C)" to the copyright symbol
+     (C-in-a-circle), if this symbol is available in the user's
+     locale.  Otherwise, do not translate "(C)"; leave it as-is.  */
+  fprintf (stream, version_etc_copyright, _("(C)"), COPYRIGHT_YEAR);
+
+  fputs (_("\
+\n\
+This is free software.  You may redistribute copies of it under the terms of\n\
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n\
+There is NO WARRANTY, to the extent permitted by law.\n\
+\n\
+"),
+	 stream);
+
   switch (n_authors)
     {
     case 0:
@@ -135,15 +151,6 @@
       break;
     }
   va_end (authors);
-  putc ('\n', stream);
-
-  fputs (version_etc_copyright, stream);
-  putc ('\n', stream);
-
-  fputs (_("\
-This is free software; see the source for copying conditions.  There is NO\n\
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"),
-	 stream);
 }