diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 11b6e925108..59278dc2349 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-27  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/31812
+	* parse.c (next_statement): Warn for truncated lines if source is free
+	form.
+
 2007-05-27 Paul Thomas  <pault@gcc.gnu.org>
 	   Tobias Burnus  <burnus@net-b.de>
 
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 9e47ea416e5..46604cfd3cd 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -653,7 +653,7 @@ next_statement (void)
 
       if (gfc_at_eol ())
 	{
-	  if (gfc_option.warn_line_truncation
+	  if ((gfc_option.warn_line_truncation || gfc_current_form == FORM_FREE)
 	      && gfc_current_locus.lb
 	      && gfc_current_locus.lb->truncated)
 	    gfc_warning_now ("Line truncated at %C");