diff --git a/ChangeLog b/ChangeLog
index be74316..20a825a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-02  H.J. Lu  <hjl@gnu.org>
+
+	* config.guess (mips:Linux:*:*): Undef CPU, mips and mipsel first.
+
 2001-12-13  Douglas B. Rupp  <rupp@gnat.com>
 
 	* config.guess: Recognize x86 Interix version 3.
diff --git a/config.guess b/config.guess
index 83e7b84..78ba818 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   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-13'
+timestamp='2002-01-02'
 
 # 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
@@ -770,6 +770,9 @@ EOF
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
 	CPU=mipsel 
 	#else