diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6e078ca55492053f91a62ef78abd9d9a4bbaca69..c80f159db843d0ca873fd9c4af6563e878514f13 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2001-07-13  Hartmut Penner  <hpenner@de.ibm.com>
+
+        * config.gcc: Add configuration for s/390. 
+        * config/s390/s390.c: New. Subroutines for code generation.
+	* config/s390/s390.h: New. Definitions for s/390.
+	* config/s390/s390-protos.h: New. Prototypes.
+	* config/s390/linux.h: New. Definitions for linux for s/390.
+	* config/s390/linux64.h: New. Definitions for linux for zSeries.
+        * config/s390/t-linux: New. Makefile fragment.
+        * config/s390/s390.md: New. Machine description for s/390 and zSeries.
+	* config/s390/fixdfdi.h: New. Fix L_fix*di.
+	
 Fri Jul 13 14:46:21 CEST 2001  Jan Hubicka  <jh@suse.cz>
 
 	* emit-rtl.c (try_split): Update mark_jump_label call.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 353086c683210596262ab786d0483ff768ec82fa..b5d01dcb695156a133aae43643a8d45dae9c1c95 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2753,6 +2753,24 @@ rs6000-*-lynxos*)
 	tmake_file=rs6000/t-rs6000
 	use_collect2=yes
 	;;
+s390-*-linux*)	
+	xmake_file=x-linux
+	tm_file=s390/linux.h
+	tmake_file="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'
+	fi
+	;;
+s390x-*-linux*)	
+	xmake_file=x-linux
+	tm_file=s390/linux64.h
+	tmake_file="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'
+	fi
+	;;
 sh-*-elf*)
 	tmake_file="sh/t-sh sh/t-elf"
 	tm_file="sh/sh.h sh/elf.h"