diff --git a/ChangeLog b/ChangeLog
index 9717da8..076889f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-05  Steve Kenton  <skenton@ou.edu>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub (blackfin, blackfin-*, m68knommu, m68knommu-*,
+	parisc, parisc-*): New Linux-specific aliases for conformity with
+	Linux architecture names.
+	* testsuite/config-sub.data: Add test cases.
+
 2007-11-19  Marc Gauthier  <marc@tensilica.com>
 
 	* config.guess (xtensa*:Linux:*:*): Accept variants.
diff --git a/config.sub b/config.sub
index 5190461..62d9cbe 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-11-19'
+timestamp='2007-12-05'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -447,6 +447,14 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -672,6 +680,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -817,6 +833,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 2a5e1f1..03a0b75 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -115,3 +115,6 @@ mep				mep-unknown-elf
 mep-elf				mep-unknown-elf
 mingw32ce			arm-unknown-mingw32ce	
 arm-mingw32ce			arm-unknown-mingw32ce
+blackfin			bfin-unknown-linux-gnu
+m68knommu			m68k-unknown-linux-gnu
+parisc				hppa-unknown-linux-gnu