diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 83e31b462e98b065db0e3d6fdec5c838e55b2234..61ef47e1e63191b63c7e54658b86d7c2d75a7604 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-13  Andreas Jaeger  <aj@suse.de>
+
+	* config.gcc: Use t-slibgcc-elf to build shared libgcc_s on
+	s390*linux.
+
 2000-08-13 Theodore Papadopoulo <Theodore.Papadopoulo@sophia.inria.fr>
 
 	* dwarf2out.c (output_cfa_loc): Fix typo in comment.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 433e77c5ad06cba03d72a68ea4621b12a77434ee..79e30252d0046b076d0cca2d5043cb4a0cb86240 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2779,7 +2779,7 @@ rs6000-*-lynxos*)
 s390-*-linux*)	
 	xmake_file=x-linux
 	tm_file=s390/linux.h
-	tmake_file="t-linux s390/t-linux"
+	tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux"
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
 	if test x$enable_threads = xyes; then
 		thread_file='posix'
@@ -2788,7 +2788,7 @@ s390-*-linux*)
 s390x-*-linux*)	
 	xmake_file=x-linux
 	tm_file=s390/linux64.h
-	tmake_file="t-linux s390/t-linux"
+	tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux"
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
 	if test x$enable_threads = xyes; then
 		thread_file='posix'