diff --git a/ChangeLog b/ChangeLog
index 3f8dcbb7..0ee24c91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-09-29  Vadim  <vadim@olly.ru>
+
+	* ltconfig.in (sysv):  More UW7 support.
+
 1999-09-28  Albert Cheng  <acheng@ncsa.uiuc.edu>
 
 	* ltmain.in (shlibpath_var): ensure the variable is non-empty before
diff --git a/ltconfig.in b/ltconfig.in
index f9c9c4bc..57e92285 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1416,7 +1416,7 @@ EOF
     fi
     ;;
 
-  solaris*)
+  solaris* | sysv5*)
     if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
       ld_shlibs=no
       cat <<EOF 1>&2
@@ -1667,6 +1667,17 @@ else
     link_all_deplibs=yes
     ;;
 
+  sysv5*)
+    no_undefined_flag=' -z text'
+    # $CC -shared without GNU ld will not create a library from C++
+    # object files and a static libstdc++, better avoid it by now
+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
+    hardcode_libdir_flag_spec=
+    hardcode_shlibpath_var=no
+    ;;
+
   sunos4*)
     archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
     hardcode_libdir_flag_spec='-L$libdir'
@@ -2175,7 +2186,7 @@ hpux*) # Its linker distinguishes data from code symbols
 irix*)
   symcode='[BCDEGRST]'
   ;;
-solaris*)
+solaris* | sysv5*)
   symcode='[BDT]'
   ;;
 sysv4)