diff --git a/ChangeLog b/ChangeLog
index 6af694e..00daa45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-30  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* config.guess (mips64:Linux:*:*): Recognize.
+	(mips:Linux:*:*): Recognize as mips-unknown-linux-gnu instead of
+	mips-pc-linux-gnu.
+
 2002-11-30  Douglas B Rupp  <rupp@gnat.com>
 
 	* config.guess: Make default Interix arch "i586".
diff --git a/config.guess b/config.guess
index 3f4f2c3..a69d969 100755
--- a/config.guess
+++ b/config.guess
@@ -822,7 +822,27 @@ EOF
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	rm -f $dummy.c && rmdir $tmpdir
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	rm -f $dummy.c && rmdir $tmpdir
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu