diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 39606c8f13a..54ac5738c01 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-21  Janne Blomqvist  <jb@gcc.gnu.org>
+
+	PR libfortran/30162
+	* io/open.c (test_endfile): Call stell only if size != 0.
+	* io/unix.c (raw_tell): Revert r194679.
+	(raw_size): Return size field only for regular files, otherwise 0.
+
 2013-02-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	PR target/56347
diff --git a/libgfortran/io/open.c b/libgfortran/io/open.c
index 28957673eff..d9cfde853f5 100644
--- a/libgfortran/io/open.c
+++ b/libgfortran/io/open.c
@@ -152,8 +152,12 @@ static const st_option async_opt[] =
 static void
 test_endfile (gfc_unit * u)
 {
-  if (u->endfile == NO_ENDFILE && ssize (u->s) == stell (u->s))
-    u->endfile = AT_ENDFILE;
+  if (u->endfile == NO_ENDFILE)
+    { 
+      gfc_offset sz = ssize (u->s);
+      if (sz == 0 || sz == stell (u->s))
+	u->endfile = AT_ENDFILE;
+    }
 }
 
 
diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
index ba8392d21a1..8b9d7a77342 100644
--- a/libgfortran/io/unix.c
+++ b/libgfortran/io/unix.c
@@ -342,15 +342,7 @@ raw_seek (unix_stream * s, gfc_offset offset, int whence)
 static gfc_offset
 raw_tell (unix_stream * s)
 {
-  gfc_offset x;
-  x = lseek (s->fd, 0, SEEK_CUR);
-
-  /* Non-seekable files should always be assumed to be at
-     current position.  */
-  if (x == -1 && errno == ESPIPE)
-    x = 0;
-
-  return x;
+  return lseek (s->fd, 0, SEEK_CUR);
 }
 
 static gfc_offset
@@ -360,7 +352,10 @@ raw_size (unix_stream * s)
   int ret = fstat (s->fd, &statbuf);
   if (ret == -1)
     return ret;
-  return statbuf.st_size;
+  if (S_ISREG (statbuf.st_mode))
+    return statbuf.st_size;
+  else
+    return 0;
 }
 
 static int