diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 489befa393f..0ad9eb23945 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-21  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* config/s390/s390.c (s390_option_override): Make -mhard-dfp the
+	default if possible and not specified otherwise.
+
 2012-02-21  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/52314
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 824308addc6..d6e250fd5a8 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -1540,6 +1540,11 @@ s390_option_override (void)
   if (TARGET_64BIT && !TARGET_ZARCH)
     error ("64-bit ABI not supported in ESA/390 mode");
 
+  /* Use hardware DFP if available and not explicitly disabled by
+     user. E.g. with -m31 -march=z10 -mzarch   */
+  if (!(target_flags_explicit & MASK_HARD_DFP) && TARGET_DFP)
+    target_flags |= MASK_HARD_DFP;
+
   if (TARGET_HARD_DFP && !TARGET_DFP)
     {
       if (target_flags_explicit & MASK_HARD_DFP)