diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8203f53b6fd2c025ddd7084e6539e4a52426eb26..d91fa3d31e23ba93ea5c91e253cdd1b0fd723c9f 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,6 +1,11 @@
+2004-05-21  Roger Sayle  <roger@eyesopen.com>
+
+	* io.c (check_format): Use gfc_notify_std to determine whether to
+	issue an error/warning for omitting the digits from the X format.
+
 2004-05-20  Roger Sayle  <roger@eyesopen.com>
 
-	* io.c (format_item): Allow the number before the X format to
+	* io.c (check_format): Allow the number before the X format to
 	be optional when not -pedantic.
 
 2004-05-18  Feng Wang  <fengwang@nudt.edu.cn>
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index 7d3702c8f2dd5a1a7d58cdf5a7e1d3ed496bf5bd..6a31bfa04fb52db8ee1dca4db745058a1b1db25e 100644
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -473,10 +473,11 @@ format_item:
 
     case FMT_X:
       /* X requires a prior number if we're being pedantic.  */
-      if (!pedantic)
-	goto between_desc;
-      error = "X descriptor requires leading space count";
-      goto syntax;
+      if (gfc_notify_std (GFC_STD_GNU, "Extension: X descriptor "
+			  "requires leading space count at %C")
+	  == FAILURE)
+	return FAILURE;
+      goto between_desc;
 
     case FMT_SIGN:
     case FMT_BLANK: