diff --git a/ChangeLog b/ChangeLog
index 3a67556..c1c3f8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-13  Theo Markettos  <address@hidden>
+
+	* config.guess (arm:*:riscos:*): Allow any form of arm{arch suffix}
+	* testsuite/config-guess.data: Add a test case
+
 2012-08-18  Anthony G. Basile  <address@hidden>
 
 	* config.sub (linux-musl*): New.
diff --git a/config.guess b/config.guess
index 137bedf..099d316 100755
--- a/config.guess
+++ b/config.guess
@@ -306,7 +306,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index d4c173f..0d18ea6 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -6,6 +6,7 @@ aarch64_be	ignored		Linux		ignored aarch64_be-unknown-linux-gnu
 amd64	1.5.12(0.116/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
 arm	ignored			riscos		ignored	arm-unknown-riscos
 arm	ignored			RISCOS		ignored	arm-unknown-riscos
+armv4l	ignored			riscos		ignored	arm-unknown-riscos
 authenticamd	6.0		Interix		ignored	x86_64-unknown-interix6.0
 avr32	2.6.15			Linux		ignored	avr32-unknown-linux-gnu
 BePC	1.0			Haiku		ignored	i586-pc-haiku