diff --git a/ChangeLog b/ChangeLog
index e6c53a8..3ed184d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-01  Linas Vepstas <linasvepstas@gmail.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.guess (hexagon:Linux:*:*): New.
+	* testsuite/config-guess.data: Add a test case.
+
 2011-09-09  Linas Vepstas  <linasvepstas@gmail.com>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.guess b/config.guess
index f7dd69e..43f0cdb 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011 Free Software Foundation, Inc.
 
-timestamp='2011-08-20'
+timestamp='2011-10-01'
 
 # 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
@@ -902,6 +902,9 @@ EOF
     frv:Linux:*:*)
 	echo frv-unknown-linux-gnu
 	exit ;;
+    hexagon:Linux:*:*)
+	echo hexagon-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
 	eval $set_cc_for_build
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index b6be7a8..ac8e858 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -47,3 +47,4 @@ tile	2.6.36			Linux		ignored	tile-unknown-linux-gnu
 tilegx	2.6.36			Linux		ignored	tilegx-unknown-linux-gnu
 NEO-1	1.0			NONSTOP_KERNEL	ignored	neo-tandem-nsk1.0
 NSE-1	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
+hexagon	1.0			Linux		ignored	hexagon-unknown-linux-gnu