diff --git a/ChangeLog b/ChangeLog
index 017727a..21f70e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-03  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (mips64el:Linux:*:*): New.
+	* testsuite/config-guess.data: Add a test case.
+
 2016-09-11  David Abdurachmanov  <david.abdurachmanov@gmail.com>
 
 	* config.guess (riscv32:Linux:*:*, riscv64:Linux:*:*): New.
diff --git a/config.guess b/config.guess
index bf5ad89..2e9ad7f 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2016-09-11'
+timestamp='2016-10-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
@@ -1000,6 +1000,9 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index ff0106a..d35bf6f 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -52,6 +52,7 @@ i86xen	5.0	AuroraUX	ignored	ignored	i386-pc-auroraux5.0
 IA64	6.0	Interix	ignored	ignored	ia64-unknown-interix6.0
 k1om	2.6.38	Linux	ignored	ignored	k1om-unknown-linux-gnu
 macppc	1.0	MirBSD	ignored	ignored	powerpc-unknown-mirbsd1.0
+mips64el 2.6.2	Linux	ignored	ignored	mips64el-unknown-linux-gnu
 NEO-1	1.0	NONSTOP_KERNEL	ignored	ignored	neo-tandem-nsk1.0
 NSE-1	1.0	NONSTOP_KERNEL	ignored	ignored	nse-tandem-nsk1.0
 NSE-N	1.0	NONSTOP_KERNEL	ignored	ignored	nse-tandem-nsk1.0