diff --git a/ChangeLog b/ChangeLog
index 20a825a..17eae75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-02  Ben Elliston  <bje@redhat.com>
+
+	From Sigbjorn Skjaeret <cisc@c2i.net>.
+	* config.guess: Add detection for MorphOS.
+	* config.sub: Handle morphos*.
+
 2002-01-02  H.J. Lu  <hjl@gnu.org>
 
 	* config.guess (mips:Linux:*:*): Undef CPU, mips and mipsel first.
diff --git a/config.guess b/config.guess
index 78ba818..1c1090c 100755
--- a/config.guess
+++ b/config.guess
@@ -289,6 +289,9 @@ EOF
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
diff --git a/config.sub b/config.sub
index 59148c7..5fbf2ea 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2001-12-10'
+timestamp='2002-01-02'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -629,6 +629,10 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1087,7 +1091,7 @@ case $os in
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus*)
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* | -morphos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)