diff --git a/config.sub b/config.sub
index b383914a8b..e123bfa7b7 100755
--- a/config.sub
+++ b/config.sub
@@ -67,6 +67,14 @@ case $os in
 		os=-scosysv322
 		basic_machine=i386-unknown
 		;;
+	-OSE68k | -ose68k | -OSE | -ose | -es1800)
+		os=-ose
+		basic_machine=m68k-ericsson
+		;;
+	-OSE68000 | -ose68000)
+		os=-ose
+		basic_machine=m68000-ericsson
+		;;
 	-isc*)
 		os=-iscsysv
 		basic_machine=i386-unknown
@@ -90,13 +98,15 @@ esac
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types with without company name.
-	tahoe | i386 | i860 | m68k | m680[01234]0 | m88k | ns32k | arm | pyramid \
+	tahoe | i386 | i486 | i860 | m68k | m680[01234]0 | m683?2 \
+		| m88k | ns32k | arm | pyramid \
 		| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 | we32k\
 		| v70)
 		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the basic CPU types with with company name.
-	vax-* | tahoe-* | i386-* | i860-* | m68k-* | m680[01234]0-* | m88k-* \
+	vax-* | tahoe-* | i386-* | i860-* | m68k-* \
+	      | m680[01234]0-* | m683?2-* | m88k-* \
 	      | sparc-* | ns32k-* | alliant-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
@@ -282,6 +292,10 @@ case $basic_machine in
 	sun4)
 		basic_machine=sparc-sun
 		;;
+	msdos)
+		basic_machine=i386-unknown	
+		os=-msdos
+		;;
 	pbd)
 		basic_machine=sparc-unicom
 		;;
@@ -443,7 +457,7 @@ case $basic_machine in
 		os=-hpux
 		;;
 	ncr3000)
-		basic_machine=i386-ncr
+		basic_machine=i486-ncr
 		os=-sysv4
 		;;
 	necv70)
@@ -478,6 +492,14 @@ case $basic_machine in
 		basic_machine=m68k-wrs
 		os=-vxworks
 		;;
+	es1800 | OSE68k | ose68k)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
 	os68k)
 		basic_machine=m68k-none
 		os=-os68k
@@ -542,12 +564,12 @@ case $os in
 	# First accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative must end in a *, to match a version number.
-	-bsd* | -sysv* | -mach* | -minix* | -genix* | -ultrix* | -aout \
+	-bsd* | -sysv* | -mach* | -minix* | -genix* | -ultrix* | -aout | -coff \
 	      | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos* | -hpux* \
 	      | -unos* | -osf* | -v88r* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -newsos | -amigados* | -msdos* | -none* | -os68k* | -irix* \
 	      | -nindy* | -vxworks* | -ebmon* | -udi | -hms* | -xray \
-	      | -m88kbcs* | -go32 | -linux*)
+	      | -m88kbcs* | -go32 | -linux* )
 	;;
 # start-sanitize-v9
 	-v7 | -v9 | -hal32 | -hal64) ;;
@@ -578,6 +600,12 @@ case $os in
 	-svr3)
 		os=-sysv3
 		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
 	*)
 		# Get rid of the `-' at the beginning of $os.
 		os=`echo $1 | sed 's/[^-]*-//'`
@@ -666,6 +694,9 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
+			-vxworks*)
+				vendor=wrs
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
diff --git a/config/.Sanitize b/config/.Sanitize
index 7cc1320c6c..27e35b2590 100644
--- a/config/.Sanitize
+++ b/config/.Sanitize
@@ -36,11 +36,11 @@ mh-sco
 mh-solaris
 mh-sysv
 mh-sysv4
-mt-OSE68000
-mt-OSE68k
 mt-a29k
 mt-ebmon29k
 mt-os68k
+mt-ose68000
+mt-ose68k
 mt-vxworks68
 mt-vxworks960
 
diff --git a/config/mt-ose68000 b/config/mt-ose68000
new file mode 100644
index 0000000000..aa125affb2
--- /dev/null
+++ b/config/mt-ose68000
@@ -0,0 +1,2 @@
+ALL= all.cross
+INSTALL_TARGET= install.cross
diff --git a/config/mt-ose68k b/config/mt-ose68k
new file mode 100644
index 0000000000..aa125affb2
--- /dev/null
+++ b/config/mt-ose68k
@@ -0,0 +1,2 @@
+ALL= all.cross
+INSTALL_TARGET= install.cross
diff --git a/configure.in b/configure.in
index 2d376caa65..af3e8d06a3 100644
--- a/configure.in
+++ b/configure.in
@@ -56,6 +56,19 @@ amd)
 			;;
 	esac
 	;;
+ericsson)
+	case "${target_alias}" in
+		OSE68000 | ose68000)
+			bfd_target="ose68000"
+			;;
+		OSE68k | ose68k)
+			bfd_target="ose68k"
+			;;
+		*)
+			bfd_target=${target-alias}
+			;;
+	esac
+	;;
 *)
 	bfd_target=${target_alias}
 	;;
diff --git a/gas/configure.in b/gas/configure.in
index b92296de40..977b0ec74c 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -140,7 +140,7 @@ vxworks)
 	*) obj_format=aout ;;
 	esac
 	;;
-OSE)
+OSE | ose)
 	obj_format=aout
 	emulation=sun3
 	;;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index be385237ec..536e3d7879 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug 24 14:42:06 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure.in, config/ose68.mt: renamed OSE to ose.
+
 Thu Aug 20 19:55:22 1992  Ken Raeburn  (raeburn@cygnus.com)
 
 	* ldsym.c (write_file_locals): Reorder check for common or
diff --git a/ld/config/.Sanitize b/ld/config/.Sanitize
index ddbc0c1017..e1d3031e9f 100644
--- a/ld/config/.Sanitize
+++ b/ld/config/.Sanitize
@@ -31,7 +31,6 @@ fi
 
 Things-to-keep:
 
-OSE68.mt
 coff-a29k.mt
 coff-h8300.mt
 delta88.mh
@@ -47,6 +46,7 @@ m68k.mt
 m68kv.mt
 m88k-bcs.mt
 news.mt
+ose68.mt
 rtbsd.mh
 sa29200.mt
 sparc-ll.mh
diff --git a/ld/config/ose68.mt b/ld/config/ose68.mt
new file mode 100644
index 0000000000..6d502982ba
--- /dev/null
+++ b/ld/config/ose68.mt
@@ -0,0 +1 @@
+EMUL=sun3
diff --git a/ld/configure.in b/ld/configure.in
index 8e295c3632..bd95af30e7 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -142,7 +142,7 @@ wrs)
 	sparc) my_target=vxsparc;;
 	esac
 	;;
-ericsson) my_target=OSE68 ;;
+ericsson) my_target=ose68 ;;
 tandem) my_target=st2000 ;;
 *)
 	case ${target_cpu} in