diff --git a/ChangeLog b/ChangeLog
index 1c626b3c26..016b58f480 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 15 22:14:34 2005  sheepman  <sheepman@tcn.zaq.ne.jp>
+
+	* ext/readline/readline.c (Readline.readline): use rl_outstream 
+	  and rl_instream.  [ruby-dev:25699]
+
 Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/parser.rb (RSS::ListenerMixin::tag_end):
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 4c7b08f514..a8d2f82795 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -7,6 +7,7 @@
 #include <readline/history.h>
 
 #include "ruby.h"
+#include "rubyio.h"
 #include "rubysig.h"
 
 #ifdef HAVE_UNISTD_H
@@ -45,6 +46,7 @@ readline_readline(argc, argv, self)
     char *prompt = NULL;
     char *buff;
     int status;
+    OpenFile *ofp, *ifp;
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
@@ -54,6 +56,10 @@ readline_readline(argc, argv, self)
 
     if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "stdin closed");
 
+    GetOpenFile(rb_stdout, ofp);
+    rl_outstream = rb_io_stdio_file(ofp);
+    GetOpenFile(rb_stdin, ifp);
+    rl_instream = rb_io_stdio_file(ifp);
     buff = (char*)rb_protect((VALUE(*)_((VALUE)))readline, (VALUE)prompt,
                               &status);
     if (status) {