diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 36135666395..cc21e396b7c 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-16  Richard Guenther  <rguenther@suse.de>
+
+	* Makefile.in: Add EH_MECHANISM=-gcc to s390(x) linux.
+
 2005-11-16  Joel Sherrill <joel.sherrill@oarcorp.com>
 
         PR ada/24855
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index 0dfe8ae1816..34f6399d552 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -780,6 +780,7 @@ ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
   TOOLS_TARGET_PAIRS =  \
     mlib-tgt.adb<mlib-tgt-linux.adb
 
+  EH_MECHANISM=-gcc
   THREADSLIB = -lpthread
   GNATLIB_SHARED = gnatlib-shared-dual
   PREFIX_OBJS = $(PREFIX_REAL_OBJS)