diff --git a/ChangeLog b/ChangeLog
index c2fe24735..be8ba3569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
    Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>
  - (djm) Fixed undefined variables for OSF SIA. Report from 
    Baars, Henk <Hendrik.Baars@nl.origin-it.com>
+ - (djm) Handle EWOULDBLOCK returns from read() and write() in atomicio.c 
+   Fix from Marquess, Steve Mr JMLFDC <Steve.Marquess@DET.AMEDD.ARMY.MIL>
 
 20000702
  - (djm) Fix brace mismatch from Corinna Vinschen <vinschen@cygnus.com>
diff --git a/atomicio.c b/atomicio.c
index 7d9f9340c..45da22d3b 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -46,7 +46,11 @@ atomicio(f, fd, _s, n)
 		res = (f) (fd, s + pos, n - pos);
 		switch (res) {
 		case -1:
+#ifdef EWOULDBLOCK
+			if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
+#else
 			if (errno == EINTR || errno == EAGAIN)
+#endif
 				continue;
 		case 0:
 			return (res);