diff --git a/ChangeLog b/ChangeLog
index 1de5c73..3fd74a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-13  Ben Elliston  <bje@gnu.org>
+
+	* config.sub (maybe_os): Clean up 386BSD.
+	* testsuite/config-sub.data: Adjust test cases.
+
 2018-01-13  Ben Elliston  <bje@gnu.org>
 
 	* testsuite/config-guess.data: Sort.
diff --git a/config.sub b/config.sub
index 051ea87..747897c 100755
--- a/config.sub
+++ b/config.sub
@@ -457,7 +457,7 @@ case $basic_machine in
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-bsd
 		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -1392,7 +1392,7 @@ case $os in
 	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
 	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 25acabe..65bcee9 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -1,5 +1,5 @@
 1750a						1750a-unknown-none
-386bsd						i386-unknown-bsd
+386bsd						i386-pc-bsd
 580						580-unknown-none
 a29k						a29k-unknown-none
 a29khif						a29k-amd-udi
@@ -151,8 +151,10 @@ hppa64						hppa64-unknown-none
 hppa						hppa-unknown-none
 hppa-next					hppa-next-nextstep
 i370						i370-ibm-mvs
+i386-386bsd					i386-pc-bsd
 i386-aros					i386-pc-aros
 i386-bitrig					i386-pc-bitrig
+i386-bsd					i386-pc-bsd
 i386-cloudabi					i386-pc-cloudabi
 i386-drops1.0					i386-pc-drops1.0
 i386-elf					i386-pc-elf