diff --git a/ChangeLog b/ChangeLog
index 0837209..c30605d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-11  Inderpreet Singh  <inderpreetb@noida.hcltech.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub: Handle maxq target.
+	* testsuite/config-sub.data: Add maxq and maxq-elf tests.
+
 2004-11-30  Melissa Mears  <asterisk@graces.dricas.com>
 
 	* config.sub: Handle xbox alias.
diff --git a/config.sub b/config.sub
index 0f84ac2..987b17d 100755
--- a/config.sub
+++ b/config.sub
@@ -237,7 +237,7 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -310,7 +310,7 @@ case $basic_machine in
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index e55b517..88f32bc 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -26,3 +26,5 @@ xscale				xscale-unknown-none
 xscaleeb			xscaleeb-unknown-none
 xscaleel			xscaleel-unknown-none
 xbox				i686-pc-mingw32
+maxq				maxq-unknown-none
+maxq-elf			maxq-unknown-elf