diff --git a/ChangeLog b/ChangeLog
index 84dd9d7..89b7c8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,17 @@
 2018-01-14  Ben Elliston  <bje@gnu.org>
 
-	* config.sub (maybe_os): Remove duplicated pattern -haiku*.
+	* config.sub (maybe_os): Remove duplicate pattern -beos*.
+	* testsuite/config-sub.data: Add a test.
+
+2018-01-14  Ben Elliston  <bje@gnu.org>
+
+	* config.sub (maybe_os): Remove duplicate pattern -haiku*.
 	(basic_machine): Don't match haiku in the manufacturer field.
 	* testsuite/config-sub.data: Add a test.
 
 2018-01-14  Ben Elliston  <bje@gnu.org>
 
-	* config.sub (maybe_os): Remove duplicated pattern -opened* which
+	* config.sub (maybe_os): Remove duplicate pattern -opened* which
 	prevents the more specific case matching on line 1427.
 	* testsuite/config-sub.data: Add a test.
 
diff --git a/config.sub b/config.sub
index 4246058..3ef5399 100755
--- a/config.sub
+++ b/config.sub
@@ -1406,7 +1406,7 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index dcbcf34..d2c9027 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -371,9 +371,10 @@ powerpc-elf-lynxos				powerpc-elf-lynxos
 powerpc-haiku					powerpc-unknown-haiku
 powerpcle					powerpcle-unknown-none
 powerpc-pikeos					powerpc-unknown-elf
-powerpc					powerpc-unknown-none
+powerpc						powerpc-unknown-none
 powerpc-sysgo-pikeos				powerpc-sysgo-elf
 powerpc-xcoff-lynxos178				powerpc-xcoff-lynxos178
+ppc-beos					powerpc-be-beos
 ppcbe-elf					powerpc-unknown-elf
 ppcbe-none-elf					powerpc-none-elf
 ppcbe						powerpc-unknown-none