diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 715ceebb1eb..7df9edf3f6c 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-13  Tobias Schlüter  <tobias.schlueter@physik.uni-muenchen.de>
+
+	* io/format.c: (parse_format_list): No comma is required after
+	P descriptor.
+
 2004-05-13  Bud Davis  <bdavis9659@comcast.net>
 
 	PR fortran/15204
diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c
index caec1672da5..0be913c59b9 100644
--- a/libgfortran/io/format.c
+++ b/libgfortran/io/format.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by Andy Vaught
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -510,7 +510,7 @@ format_item:
 	}
 
       saved_token = t;
-      goto between_desc;
+      goto optional_comma;
 
     case FMT_P:		/* P and X require a prior number */
       error = "P descriptor requires leading scale factor";