diff --git a/ChangeLog b/ChangeLog
index ba073f7..e7629a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-06  Ben Elliston  <bje@redhat.com>
+
+	* config.sub: Add --version option.
+	* config.guess: Likewise.
+
 2000-12-02  Ben Elliston  <bje@redhat.com>
 
 	* config.guess: Only append "elf" to "netbsd" for platforms that
diff --git a/config.guess b/config.guess
index 3b0cc04..4802d0d 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-02'
+timestamp='2000-12-06'
 
 # 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
@@ -48,6 +48,7 @@ Output the configuration name of the system \`$me' is run on.
 Operation modes:
   -h, --help         print this help, then exit
   -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>.
 
@@ -61,8 +62,10 @@ Try \`$me --help' for more information."
 # Parse command line
 while test $# -gt 0 ; do
   case $1 in
-    --time-stamp | --time* | -t)
+    --time-stamp | --time* | -t )
        echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "GNU config.guess (last modified $timestamp)" ; exit 0 ;;
     --help | --h* | -h )
        echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
diff --git a/config.sub b/config.sub
index b522aaf..d2f956a 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-11-26'
+timestamp='2000-12-06'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -62,6 +62,7 @@ Canonicalize a configuration name.
 Operation modes:
   -h, --help         print this help, then exit
   -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>.
 
@@ -76,6 +77,8 @@ while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
        echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "GNU config.sub (last modified $timestamp)" ; exit 0 ;;
     --help | --h* | -h )
        echo "$usage"; exit 0 ;;
     -- )     # Stop option processing