diff --git a/ChangeLog b/ChangeLog
index dc4e335..f108c1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-11  Mike Frysinger  <vapier@gentoo.org>
+
+	* config.sub (arm): Handle armv6/armv7/armv8 targets.
+	* testsuite/config-sub.data: Add test cases.
+
 2012-10-10  David Holsgrove  <david.holsgrove@xilinx.com>
 
 	* config.sub (microblazeel): New.
diff --git a/config.sub b/config.sub
index 826e4c6..89b1286 100755
--- a/config.sub
+++ b/config.sub
@@ -259,8 +259,10 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 9bd2cd5..19799f9 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -16,6 +16,9 @@ arm-linux-androideabi		arm-unknown-linux-androideabi
 arm-mingw32ce			arm-unknown-mingw32ce
 arm-riscos			arm-unknown-riscos
 arm-unknown-riscos		arm-unknown-riscos
+armv6-linux-gnu			armv6-unknown-linux-gnu
+armv7a-linux-gnueabi		armv7a-unknown-linux-gnueabi
+armv8b-linux-gnueabi		armv8b-unknown-linux-gnueabi
 aros				i386-pc-aros
 avr32				avr32-unknown-none
 avr32-linux			avr32-unknown-linux-gnu