diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index c371f8dfe0f..216a0a70f5d 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-27  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libgfortran/25109
+	* io/unit.c (init_units): Set default flag to BLANK_NULL per
+	requirement of F95 standard.  Set PAD_YES for stdin.
+
 2005-11-27  David Edelsohn  <edelsohn@gnu.org>
 
 	* intrinsics/random.c: Include config.h
diff --git a/libgfortran/io/unit.c b/libgfortran/io/unit.c
index 8ac1a7d60e4..1366a9e14a8 100644
--- a/libgfortran/io/unit.c
+++ b/libgfortran/io/unit.c
@@ -393,6 +393,7 @@ get_unit (st_parameter_dt *dtp, int do_create)
       internal_unit.flags.action = ACTION_READWRITE;
       internal_unit.flags.form = FORM_FORMATTED;
       internal_unit.flags.delim = DELIM_NONE;
+      internal_unit.flags.pad = PAD_YES;
 
       return &internal_unit;
     }
@@ -453,7 +454,8 @@ init_units (void)
       u->flags.access = ACCESS_SEQUENTIAL;
       u->flags.form = FORM_FORMATTED;
       u->flags.status = STATUS_OLD;
-      u->flags.blank = BLANK_UNSPECIFIED;
+      u->flags.blank = BLANK_NULL;
+      u->flags.pad = PAD_YES;
       u->flags.position = POSITION_ASIS;
 
       u->recl = options.default_recl;
@@ -472,7 +474,7 @@ init_units (void)
       u->flags.access = ACCESS_SEQUENTIAL;
       u->flags.form = FORM_FORMATTED;
       u->flags.status = STATUS_OLD;
-      u->flags.blank = BLANK_UNSPECIFIED;
+      u->flags.blank = BLANK_NULL;
       u->flags.position = POSITION_ASIS;
 
       u->recl = options.default_recl;
@@ -491,7 +493,7 @@ init_units (void)
       u->flags.access = ACCESS_SEQUENTIAL;
       u->flags.form = FORM_FORMATTED;
       u->flags.status = STATUS_OLD;
-      u->flags.blank = BLANK_UNSPECIFIED;
+      u->flags.blank = BLANK_NULL;
       u->flags.position = POSITION_ASIS;
 
       u->recl = options.default_recl;