diff --git a/ChangeLog b/ChangeLog
index 2d95f9f..e6c53a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-09  Linas Vepstas  <linasvepstas@gmail.com>
+	    Ben Elliston  <bje@gnu.org>
+
+        * config.sub (hexagon, hexagon-*): New.
+	* testsuite/config-sub.data: Add test cases.
+
 2011-08-23  Roland McGrath  <mcgrathr@google.com>
 
 	* config.sub: Rename 32eb to be32, 32el to le32, 64el to le64, and
diff --git a/config.sub b/config.sub
index da19a88..0d2cdde 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011 Free Software Foundation, Inc.
 
-timestamp='2011-08-23'
+timestamp='2011-09-09'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -257,6 +257,7 @@ case $basic_machine in
 	| d10v | d30v | dlx | dsp16xx \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| le32 | le64 \
@@ -368,6 +369,7 @@ case $basic_machine in
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| le32-* | le64-* \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 72db2a4..643c1ac 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -41,6 +41,8 @@ djgpp				i586-pc-msdosdjgpp
 fido-elf			fido-unknown-elf
 fido				fido-unknown-none
 frv-linux			frv-unknown-linux-gnu
+hexagon-linux			hexagon-unknown-linux-gnu
+hexagon				hexagon-unknown-none
 i386-aros			i386-pc-aros
 i386-drops1.0			i386-pc-drops1.0
 i386-elf			i386-pc-elf