diff --git a/ChangeLog b/ChangeLog
index e7629a6..8eb6052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-07  Ben Elliston  <bje@redhat.com>
+
+	* config.sub: Add more detail to version information.
+	* config.guess: Likewise.
+
 2000-12-06  Ben Elliston  <bje@redhat.com>
 
 	* config.sub: Add --version option.
diff --git a/config.guess b/config.guess
index 4802d0d..69b1ab9 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-timestamp='2000-12-06'
+timestamp='2000-12-07'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,11 +50,17 @@ Operation modes:
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
 
-Report bugs and patches to <config-patches@gnu.org>.
+Report bugs and patches to <config-patches@gnu.org>."
 
-Written by Per Bothner.
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
 Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
-Free Software Foundation, Inc.  See the source for copying conditions."
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
 Try \`$me --help' for more information."
@@ -65,7 +71,7 @@ while test $# -gt 0 ; do
     --time-stamp | --time* | -t )
        echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "GNU config.guess (last modified $timestamp)" ; exit 0 ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
        echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
diff --git a/config.sub b/config.sub
index d2f956a..d6c6821 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-timestamp='2000-12-06'
+timestamp='2000-12-07'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -64,10 +64,16 @@ Operation modes:
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
 
-Report bugs and patches to <config-patches@gnu.org>.
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
-Free Software Foundation, Inc.  See the source for copying conditions."
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
 Try \`$me --help' for more information."
@@ -78,7 +84,7 @@ while test $# -gt 0 ; do
     --time-stamp | --time* | -t )
        echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "GNU config.sub (last modified $timestamp)" ; exit 0 ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
        echo "$usage"; exit 0 ;;
     -- )     # Stop option processing