diff --git a/ChangeLog b/ChangeLog
index ad72cc5..bbed098 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-27  Albert Ou  <aou@eecs.berkeley.edu>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub (riscv32-*, riscv64-*): Allow company name.
+	* testsuite/config-sub.data: Add test cases.
+
 2015-07-24  Branko Drevenšek <brankod@beyondsemi.com>
 
 	* config.sub (ba): Recognise.
diff --git a/config.sub b/config.sub
index c17d3d7..f018151 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2015-07-24'
+timestamp='2015-07-28'
 
 # 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
@@ -430,6 +430,7 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 566a126..10c52b6 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -228,9 +228,11 @@ rdos32				i386-pc-rdos
 rdos64				x86_64-pc-rdos
 rdos				x86_64-pc-rdos
 riscv32-elf			riscv32-unknown-elf
+riscv32-company-elf		riscv32-company-elf
 riscv32-linux			riscv32-unknown-linux-gnu
 riscv64-elf			riscv64-unknown-elf
 riscv64-linux			riscv64-unknown-linux-gnu
+riscv64-company-elf		riscv64-company-elf
 rl78-linux			rl78-unknown-linux-gnu
 rl78				rl78-unknown-none
 rx-linux			rx-unknown-linux-gnu