diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 1af1d73450c..98fdfd748e8 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,8 +1,3 @@
-Fri Jun  5 15:53:17 1998  Per Bothner  <bothner@cygnus.com>
-
-	* g77spec.c (lang_specific_pre_link, lang_specific_extra_ofiles):
-	Define - update needed by gcc.c change.
-
 Mon Jun  1 19:37:42 1998  Craig Burley  <burley@gnu.org>
 
 	* com.c (ffecom_init_0): Fix setup of INTEGER(KIND=7)
diff --git a/gcc/f/ChangeLog.egcs b/gcc/f/ChangeLog.egcs
index 3aed70a56bc..adc0fb5e11c 100644
--- a/gcc/f/ChangeLog.egcs
+++ b/gcc/f/ChangeLog.egcs
@@ -1,3 +1,16 @@
+Sun Jun  7 14:04:34 1998  Richard Henderson  <rth@cygnus.com>
+
+	* com.c (lang_init_options): New function.
+	* top.c (ffe_decode_option): Remove all trace of -fset-g77-defaults.
+	Set ffe_is_do_internal_checks_ with -version.
+	* lang-options.h: Likewise.
+	* lang-specs.h: Likewise.
+
+Fri Jun  5 15:53:17 1998  Per Bothner  <bothner@cygnus.com>
+
+	* g77spec.c (lang_specific_pre_link, lang_specific_extra_ofiles):
+	Define - update needed by gcc.c change.
+
 Fri May 15 01:44:22 1998  Mumit Khan <khan@xraylith.wisc.edu>
 
 	* Make-lang.in (f77.mostlyclean): Add missing exeext.
diff --git a/gcc/f/com.c b/gcc/f/com.c
index 4f524288a0e..85c9f5b3108 100644
--- a/gcc/f/com.c
+++ b/gcc/f/com.c
@@ -14935,6 +14935,15 @@ lang_identify ()
   return "f77";
 }
 
+void
+lang_init_options ()
+{
+  /* Set default options for Fortran.  */
+  flag_move_all_movables = 1;
+  flag_reduce_all_givs = 1;
+  flag_argument_noalias = 2;
+}
+
 void
 lang_init ()
 {
diff --git a/gcc/f/lang-options.h b/gcc/f/lang-options.h
index 9dd37589073..79cc5f71c9f 100644
--- a/gcc/f/lang-options.h
+++ b/gcc/f/lang-options.h
@@ -29,7 +29,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
   "-fversion",
   "-fnull-version",
-  "-fset-g77-defaults",
 /*"-fident",*/
 /*"-fno-ident",*/
   "-ff66",
diff --git a/gcc/f/lang-specs.h b/gcc/f/lang-specs.h
index ad90f4281ce..eb5c17c81de 100644
--- a/gcc/f/lang-specs.h
+++ b/gcc/f/lang-specs.h
@@ -52,7 +52,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 	%c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}} -traditional\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
 	%i %{!M:%{!MM:%{!E:%{!pipe:%g.i}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
-    "%{!M:%{!MM:%{!E:f771 %{!pipe:%g.i} -fset-g77-defaults %(f771) \
+    "%{!M:%{!MM:%{!E:f771 %{!pipe:%g.i} %(f771) \
 		   %{!Q:-quiet} -dumpbase %b.F %{d*} %{m*} %{a}\
 		   %{g*} %{O*} %{W*} %{w} %{pedantic*} \
 		   %{v:-version -fversion} %{pg:-p} %{p} %{f*} %{I*}\
@@ -67,7 +67,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    {"ratfor %{C} %{v}\
            %{C:%{!E:%eGNU C does not support -C without using -E}}\
            %{!E:%{!pipe:-o %g.f}}%{E:%W{o*}} %i |\n",
-    "%{!E:f771 %{!pipe:%g.f} -fset-g77-defaults %(f771) \
+    "%{!E:f771 %{!pipe:%g.f} %(f771) \
 	   %{!Q:-quiet} -dumpbase %b.r %{d*} %{m*} %{a}\
 	   %{g*} %{O*} %{W*} %{w} %{pedantic*} \
 	   %{v:-version -fversion} %{pg:-p} %{p} %{f*} %{I*}\
@@ -80,7 +80,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   {".f", {"@f77"}},
   {".for", {"@f77"}},
   {"@f77",
-   {"%{!M:%{!MM:%{!E:f771 %i -fset-g77-defaults %(f771) \
+   {"%{!M:%{!MM:%{!E:f771 %i %(f771) \
 		   %{!Q:-quiet} -dumpbase %b.f %{d*} %{m*} %{a}\
 		   %{g*} %{O*} %{W*} %{w} %{pedantic*}\
 		   %{v:-version -fversion} %{pg:-p} %{p} %{f*} %{I*}\
diff --git a/gcc/f/top.c b/gcc/f/top.c
index 19b2c77eb17..bbcc59d66bb 100644
--- a/gcc/f/top.c
+++ b/gcc/f/top.c
@@ -61,7 +61,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /* Externals defined here. */
 
 int flag_traditional;		/* Shouldn't need this (C front end only)! */
-bool ffe_is_do_internal_checks_ = TRUE;
+bool ffe_is_do_internal_checks_ = FALSE;
 bool ffe_is_90_ = FFETARGET_defaultIS_90;
 bool ffe_is_automatic_ = FFETARGET_defaultIS_AUTOMATIC;
 bool ffe_is_backslash_ = FFETARGET_defaultIS_BACKSLASH;
@@ -167,22 +167,12 @@ ffe_decode_option (char *opt)
   if (opt[1] == 'f')
     {
       if (strcmp (&opt[2], "version") == 0)
-	ffe_set_is_version (TRUE);
-      else if (strcmp (&opt[2], "null-version") == 0)
-	;			/* Someday generate program to print version
-				   info.  */
-      else if (strcmp (&opt[2], "set-g77-defaults") == 0)
 	{
-	  ffe_is_do_internal_checks_ = 0;
-#if BUILT_FOR_270	/* User must have applied patch (circa 2.7.2 and beyond). */
-#if 0
-	  flag_rerun_loop_opt = 1;
-#endif
-	  flag_move_all_movables = 1;
-	  flag_reduce_all_givs = 1;
-	  flag_argument_noalias = 2;
-#endif
+	  ffe_set_is_version (TRUE);
+	  ffe_is_do_internal_checks_ = TRUE;
 	}
+      else if (strcmp (&opt[2], "null-version") == 0)
+	;	/* Someday generate program to print version info.  */
       else if (strcmp (&opt[2], "ident") == 0)
 	ffe_set_is_ident (TRUE);
       else if (strcmp (&opt[2], "no-ident") == 0)