diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a33d409ebcd..d0ec33a3bdd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-31  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* config/rs6000/rs6000.opt: Rename -mdfp option to -mhard-dfp.
+
+	* config/s390/s390.c: (override_options): Replace -mhard-dfp/-msoft-dfp
+	with -mhard-dfp/-mno-hard-dfp.
+	* config/s390/s390.opt: Likewise.
+	* config/s390/s390.h: Add MASK_HARD_DFP to the TARGET_DEFAULT
+	definition.
+
 2007-10-30  Janis Johnson  <janis187@us.ibm.com>
 
 	* tree-ssa.c (execute_update_addresses_taken): Initialize update_vops.
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index c552a03c8fa..18ee8286c2c 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -75,7 +75,7 @@ maltivec
 Target Report Mask(ALTIVEC)
 Use AltiVec instructions
 
-mdfp
+mhard-dfp
 Target Report Mask(DFP)
 Use decimal floating point instructions
 
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index c4860e52c98..35e2fa67601 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -1448,9 +1448,9 @@ override_options (void)
   if (TARGET_64BIT && !TARGET_ZARCH)
     error ("64-bit ABI not supported in ESA/390 mode");
 
-  if (TARGET_HARD_DFP && (!TARGET_CPU_DFP || !TARGET_ZARCH))
+  if (TARGET_HARD_DFP && !TARGET_DFP)
     {
-      if (target_flags_explicit & MASK_SOFT_DFP)
+      if (target_flags_explicit & MASK_HARD_DFP)
 	{
 	  if (!TARGET_CPU_DFP)
 	    error ("Hardware decimal floating point instructions"
@@ -1460,15 +1460,15 @@ override_options (void)
 		   " not available in ESA/390 mode");
 	}
       else
-	target_flags |= MASK_SOFT_DFP;
+	target_flags &= ~MASK_HARD_DFP;
     }
 
   if ((target_flags_explicit & MASK_SOFT_FLOAT) && TARGET_SOFT_FLOAT)
     {
-      if ((target_flags_explicit & MASK_SOFT_DFP) && TARGET_HARD_DFP)
+      if ((target_flags_explicit & MASK_HARD_DFP) && TARGET_HARD_DFP)
 	error ("-mhard-dfp can't be used in conjunction with -msoft-float");
 
-      target_flags |= MASK_SOFT_DFP;
+      target_flags &= ~MASK_HARD_DFP;
     }
 
   /* Set processor cost function.  */
diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h
index 8cc8edfe070..bd2102b4cef 100644
--- a/gcc/config/s390/s390.h
+++ b/gcc/config/s390/s390.h
@@ -103,7 +103,7 @@ extern enum processor_flags s390_arch_flags;
   while (0)
 
 #ifdef DEFAULT_TARGET_64BIT
-#define TARGET_DEFAULT             (MASK_64BIT | MASK_ZARCH)
+#define TARGET_DEFAULT             (MASK_64BIT | MASK_ZARCH | MASK_HARD_DFP)
 #else
 #define TARGET_DEFAULT             0
 #endif
diff --git a/gcc/config/s390/s390.opt b/gcc/config/s390/s390.opt
index cf980265133..72b336d02a5 100644
--- a/gcc/config/s390/s390.opt
+++ b/gcc/config/s390/s390.opt
@@ -47,8 +47,8 @@ Target Report Mask(FUSED_MADD)
 Enable fused multiply/add instructions
 
 mhard-dfp
-Target Report RejectNegative InverseMask(SOFT_DFP, HARD_DFP)
-Enable hardware decimal floating point
+Target Report Mask(HARD_DFP)
+Enable decimal floating point hardware support
 
 mhard-float
 Target Report RejectNegative InverseMask(SOFT_FLOAT, HARD_FLOAT)
@@ -70,10 +70,6 @@ msmall-exec
 Target Report Mask(SMALL_EXEC)
 Use bras for executable < 64k
 
-msoft-dfp
-Target Report RejectNegative Mask(SOFT_DFP)
-Disable hardware decimal floating point
-
 msoft-float
 Target Report RejectNegative Mask(SOFT_FLOAT)
 Disable hardware floating point