diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2854206e623..082d4f8a543 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-14  Ulrich Weigand  <uweigand@de.ibm.com>
+ 
+	* config/s390/linux64.h (CPP_PREDEFINES): Define __s390__
+	also on 64-bit s390x targets.
+
 2001-08-14  Nick Clifton  <nickc@cambridge.redhat.com>
 
 	* config/arm/arm.c (arm_compute_initial_elimination_offset): New
diff --git a/gcc/config/s390/linux64.h b/gcc/config/s390/linux64.h
index 02c75c8226e..e4f2516ce7d 100644
--- a/gcc/config/s390/linux64.h
+++ b/gcc/config/s390/linux64.h
@@ -37,7 +37,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES \
-  "-Dlinux -Asystem(linux) -Acpu(s390) -Amachine(s390) -D__s390x__ \
+  "-Dlinux -Asystem(linux) -Acpu(s390) -Amachine(s390) -D__s390__ -D__s390x__ \
    -Asystem(unix) -Dunix -D__ELF__ \
    -D__LONG_MAX__=9223372036854775807L"