diff --git a/ChangeLog b/ChangeLog
index 5a3362f..5f3c3cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-05  Nathan Sidwell  <nathan@codesourcery.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub (nvptx): New.
+	* testsuite/config-sub.data: Add test cases.
+
 2013-08-10  Earnie Boyd  <earnie@users.sourceforge.net>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.sub b/config.sub
index 9633db7..85a159e 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2013-08-10'
+timestamp='2013-09-05'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -324,7 +324,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 4f14e6e..6d7d928 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -152,6 +152,7 @@ nios2el-elf			nios2el-unknown-elf
 nios2el				nios2el-unknown-none
 nios-elf			nios-unknown-elf
 nios				nios-unknown-none
+nvptx				nvptx-unknown-none
 open8-elf			open8-unknown-elf
 open8				open8-unknown-none
 openrisc-linux			or32-unknown-linux-gnu