diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 73635c11dad7..6e45b9e352ee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-08  Alan Modra  <amodra@bigpond.net.au>
+
+	PR target/23704
+	* config/rs6000/rs6000.c (rs6000_handle_option <OPT_m64>): Don't
+	override prior explicit -mno-powerpc-gfxopt.
+
 2005-11-07  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* expmed.c (extract_bit_field): Do not use insv/extv/extzv patterns
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index f9b46e358ec0..2c89cf549386 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1624,9 +1624,9 @@ rs6000_handle_option (size_t code, const char *arg, int value)
 #else
     case OPT_m64:
 #endif
-      target_flags |= MASK_POWERPC64 | MASK_POWERPC | MASK_PPC_GFXOPT;
-      target_flags_explicit |= MASK_POWERPC64 | MASK_POWERPC
-	| MASK_PPC_GFXOPT;
+      target_flags |= MASK_POWERPC64 | MASK_POWERPC;
+      target_flags |= ~target_flags_explicit & MASK_PPC_GFXOPT;
+      target_flags_explicit |= MASK_POWERPC64 | MASK_POWERPC;
       break;
 
 #ifdef TARGET_USES_AIX64_OPT