diff --git a/ChangeLog b/ChangeLog
index 06d17318d0..ef4730fc12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 29 12:08:05 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/readline/readline.c (readline_getc): Consider
+	  NULL as input.
+
 Tue Oct 29 11:10:08 2013  Aman Gupta <ruby@tmm1.net>
 
 	* gc.c (gc_profile_total_time): fix off-by-one error in
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 269ebc96eb..820c6b74be 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -204,6 +204,8 @@ static int
 readline_getc(FILE *input)
 {
     struct getc_struct data;
+    if (input == NULL) /* editline may give NULL as input. */
+        input = stdin;
     data.input = input;
     data.fd = fileno(input);
   again: