diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 87ad838829ea..bb57e97d8ec2 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-06  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libgfortran/31395
+	* io/format.c (parse_format_list): Fix parsing.
+
 2007-04-03  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	PR fortran/31304
diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c
index aa6c68bbf258..36ab89b63aa1 100644
--- a/libgfortran/io/format.c
+++ b/libgfortran/io/format.c
@@ -858,12 +858,9 @@ parse_format_list (st_parameter_dt *dtp)
       goto finished;
 
     case FMT_SLASH:
-      get_fnode (fmt, &head, &tail, FMT_SLASH);
-      tail->repeat = 1;
-
-      /* Fall Through */
-
     case FMT_COLON:
+      get_fnode (fmt, &head, &tail, t);
+      tail->repeat = 1;
       goto optional_comma;
 
     case FMT_END: