diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 39e02091b0231149e1b186c8ca62b270cfded9b7..af4b5e96f5258cb1e68c6ba9cb666b4a8877ff71 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-24  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	PR fortran/23862
+	* lang-specs.h (f95-cpp-input): Pass -ffree-form to f951 unless
+	-ffixed-form is explicitly specified.
+
 2006-06-24  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/28118
diff --git a/gcc/fortran/lang-specs.h b/gcc/fortran/lang-specs.h
index 55c4d1ea19a2fcfc7c3af102a613f4950d8d4f06..caf4b1b21140dc090e689565f704353d680632d3 100644
--- a/gcc/fortran/lang-specs.h
+++ b/gcc/fortran/lang-specs.h
@@ -22,7 +22,7 @@ This file is licensed under the GPL.  */
   "cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) \
       %{E|M|MM:%(cpp_debug_options)}\
       %{!M:%{!MM:%{!E: -o %|.f95 |\n\
-    f951 %|.f95 %(cc1_options) %{J*} %{I*}\
+    f951 %|.f95 %{!ffixed-form:-ffree-form} %(cc1_options) %{J*} %{I*}\
       -fpreprocessed %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
 {".f90", "@f95", 0, 0, 0},
 {".f95", "@f95", 0, 0, 0},