diff --git a/ChangeLog b/ChangeLog
index 7f76f69b24..393d726ac0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-19  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>
+
+	* sunrpc/svc_unix.c (readunix): Check for POLLERR, POLLHUP and
+	POLLNVAL.
+
 1998-11-19  Ulrich Drepper  <drepper@cygnus.com>
 
 	* Makeconfig: Add comment to all-subdirs definition.
diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
index 4fba428926..0aa343654f 100644
--- a/sunrpc/svc_unix.c
+++ b/sunrpc/svc_unix.c
@@ -378,6 +378,9 @@ readunix (char *xprtptr, char *buf, int len)
 	case 0:
 	  goto fatal_err;
 	default:
+	  if ((pollfd.revents & POLLERR) || (pollfd.revents & POLLHUP)
+	      || (pollfd.revents & POLLNVAL))
+	    goto fatal_err;
 	  break;
 	}
     }