diff --git a/ChangeLog b/ChangeLog
index a83b1d9131..56200e6658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  2 07:08:38 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (setattr): should retry on EINTR.
+	  [ruby-dev:42666]
+
 Thu Dec  2 02:30:50 2010  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/net/http.rb: fixed positional wording to match revised order.
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
index af8a1de694..11bb40435a 100644
--- a/ext/io/console/console.c
+++ b/ext/io/console/console.c
@@ -26,7 +26,15 @@ typedef OpenFile rb_io_t;
 #if defined HAVE_TERMIOS_H
 # include <termios.h>
 typedef struct termios conmode;
-# define setattr(fd, t) (tcsetattr(fd, TCSAFLUSH, t) == 0)
+
+static int
+setattr(int fd, conmode *t)
+{
+    while (tcsetattr(fd, TCSAFLUSH, t)) {
+	if (errno != EINTR) return 0;
+    }
+    return 1;
+}
 # define getattr(fd, t) (tcgetattr(fd, t) == 0)
 #elif defined HAVE_TERMIO_H
 # include <termio.h>