diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 87f63053fd..102bb72f4b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 12 14:51:14 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config/sysv4.mh: new file, RANLIB=echo
+
+	* configure.in: handle Solaris2 as -sysv4 or -solaris2
+
 Thu Jun 11 00:52:03 1992  John Gilmore  (gnu at cygnus.com)
 
 	* elf.c (elf_obj_tdata):  Merge elf_obj_tdata_struct and
diff --git a/bfd/configure.in b/bfd/configure.in
index 201a9debe0..e906f7622c 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -91,7 +91,7 @@ i386)
 sparc)
 	case "${host_os}" in
 	sunos64)	my_host=sparc-ll ;;
-	sysv4|sunos5*)	my_host=sysv4 ;;
+	sysv4|solaris2)	my_host=sysv4 ;;
 	sysv64)		my_host=sysv4-ll ;;
 	*)		my_host=sparc ;;
 	esac
@@ -184,7 +184,7 @@ sun)
 	case "${target_cpu}" in
 	m68k|m680[01234]0)	bfd_target=m68k-aout ;;
 	sparc)	case "${target_os}" in
-		sysv4|sunos5*)	bfd_target=sparc-elf ;;
+		sysv4|solaris2)	bfd_target=sparc-elf ;;
 		*)	bfd_target=sparc-aout ;;
 		esac
 		;;