diff --git a/ChangeLog b/ChangeLog
index a5fea90..f3565d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-31  David Barksdale <amatus@google.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub (os): Handle nacl.
+	* testsuite/config-sub.data: Add a test case.
+
 2009-12-30  Ben Elliston  <bje@gnu.org>
 
 	* config.sub (version): Add 2010.
diff --git a/config.sub b/config.sub
index f5a979e..8518609 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2009-12-31'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1436,6 +1436,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 66c19e3..221bcd0 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -162,3 +162,4 @@ ubicom32			ubicom32-unknown-none
 ubicom32-elf			ubicom32-unknown-elf
 i586-auroraux			i586-pc-auroraux
 i586-auroraux5.0		i586-pc-auroraux5.0
+i386-pc-nacl			i386-pc-nacl