diff --git a/ChangeLog b/ChangeLog
index f7befb1..20f35d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-14  Pedro Alves  <pedro@codesourcery.com>
+
+	* config.sub (dicos): New.
+	* testsuite/config-sub.data: Add test cases.
+
 2008-04-08  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (i*86:Linux:*:*): Remove handling of i386-coff ld.
diff --git a/config.sub b/config.sub
index 087f29b..c0ed41b 100755
--- a/config.sub
+++ b/config.sub
@@ -530,6 +530,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -1392,6 +1396,9 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index e266c81..f0c7c62 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -132,3 +132,8 @@ mips64octeon-elf		mips64octeon-unknown-elf
 mips64octeonel-elf		mips64octeonel-unknown-elf
 metag				metag-unknown-none
 metag-linux			metag-unknown-linux-gnu
+dicos				i686-pc-dicos
+i686-dicos			i686-pc-dicos
+i686-ericsson-dicos		i686-ericsson-dicos
+x86_64-dicos			x86_64-pc-dicos
+x86_64-ericsson-dicos		x86_64-ericsson-dicos