diff --git a/ChangeLog b/ChangeLog
index bd5b955..e405691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-16  Ben Elliston  <bje@wasabisystems.com>
+
+	Reported by Todd Humphrey <thump@isl.net>:
+	* config.guess (*:OS400:*:*): Detect OS/400 on AS/400 machines.
+	* config.sub (os400, -os400*): Recognise.
+
 2003-10-07  Robert Millan  <robertmh@gnu.org>
 	    Ben Elliston  <bje@wasabisystems.com>
 
@@ -30,8 +36,8 @@
 
 2003-07-17  Ben Elliston  <bje@wasabisystems.com>
 
+	Reported as missing by Doug Evans:
 	* config.sub: Handle iq2000 and iq2000-*.
-	Reported as missing by Doug Evans.
 
 2003-07-15  Alexandre Oliva  <aoliva@redhat.com>
 
diff --git a/config.guess b/config.guess
index 1127162..afcb19c 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-10-07'
+timestamp='2003-10-16'
 
 # 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
@@ -307,6 +307,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
diff --git a/config.sub b/config.sub
index 79657cd..a083307 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-10-07'
+timestamp='2003-10-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -743,6 +743,10 @@ case $basic_machine in
 		basic_machine=or32-unknown
 		os=-coff
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -1182,6 +1186,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1473,6 +1480,9 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;