diff --git a/slirp/misc.c b/slirp/misc.c
index 5b809a853a..a58b631003 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -320,7 +320,7 @@ fork_exec(so, ex, do_pty)
 	/* don't want to clobber the original */
 	char *bptr;
 	char *curarg;
-	int c, i;
+	int c, i, ret;
 	
 	DEBUG_CALL("fork_exec");
 	DEBUG_ARG("so = %lx", (long)so);
@@ -372,7 +372,9 @@ fork_exec(so, ex, do_pty)
 	 		 */
 			s = socket(AF_INET, SOCK_STREAM, 0);
 			addr.sin_addr = loopback_addr;
-			connect(s, (struct sockaddr *)&addr, addrlen);
+                        do {
+                            ret = connect(s, (struct sockaddr *)&addr, addrlen);
+                        } while (ret < 0 && errno == EINTR);
 		}
 		
 #if 0
@@ -436,8 +438,10 @@ fork_exec(so, ex, do_pty)
 		 	 * The only reason this will block forever is if socket()
 		 	 * of connect() fail in the child process
 		 	 */
-			so->s = accept(s, (struct sockaddr *)&addr, &addrlen);
-			closesocket(s);
+                        do {
+                            so->s = accept(s, (struct sockaddr *)&addr, &addrlen);
+                        } while (so->s < 0 && errno == EINTR);
+                        closesocket(s);
 			opt = 1;
 			setsockopt(so->s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int));
 			opt = 1;