diff --git a/ChangeLog b/ChangeLog
index ca43cc1..4422754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-11  Steven G. Johnson  <stevenj.mit@gmail.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub (bluegene, -bluegene, -cnk*): New CNK aliases.
+	* testsuite/config-sub.data: Add test cases.
+
 2009-06-09  Olli Savia  <ops@iki.fi>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.sub b/config.sub
index 67a635e..eb0389a 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-03'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -153,6 +153,9 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -467,6 +470,10 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -1260,7 +1267,7 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -1613,7 +1620,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 809df7f..ab090a3 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -150,3 +150,5 @@ i686-kopensolaris5.11-gnu	i686-pc-kopensolaris5.11-gnu
 aros				i386-pc-aros
 i386-aros			i386-pc-aros
 moxie-elf			moxie-unknown-elf
+powerpc-cnk			powerpc-ibm-cnk
+powerpc-bluegene		powerpc-ibm-cnk