diff --git a/ChangeLog b/ChangeLog
index 1d95b87d3..ef32ba25f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-14  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config.sub: Change machine triplets from mipsel*-* to mips*el-*.
+	Add support for mips64.
+
 2001-09-03  Jeff Holcomb  <jeffh@redhat.com>
 
 	* configure.in: Enable libstdc++-v3 for h8300 targets.
diff --git a/config.sub b/config.sub
index 15e4417a6..f343888bd 100755
--- a/config.sub
+++ b/config.sub
@@ -597,10 +597,18 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
+	mips64*el-linux*)
+		basic_machine=mips64el-unknown
+		os=-linux-gnu
+		;;
+	mips*el-linux*)
 		basic_machine=mipsel-unknown
 		os=-linux-gnu
 		;;
+	mips64*-linux*)
+		basic_machine=mips64-unknown
+		os=-linux-gnu
+		;;
 	mips*-linux*)
 		basic_machine=mips-unknown
 		os=-linux-gnu