diff --git a/ChangeLog b/ChangeLog
index 0be876c85a..e600efdb91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Nov  8 07:07:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: detect stdio buffer pointers for uClibc.  a patch
+	  from Brian Candler <B.Candler at pobox.com> in [ruby-core:12020].
+	  [ruby-core:19713]
+
 Sat Nov  8 06:51:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/dbm/dbm.c (fdbm_index): make #index warn like Hash.
diff --git a/configure.in b/configure.in
index c6d43c139d..779d6adb23 100644
--- a/configure.in
+++ b/configure.in
@@ -1038,6 +1038,7 @@ AC_CACHE_VAL(rb_cv_frptr,
      __ptr	dnl
      bufpos	dnl
      _p	dnl
+     __bufpos	dnl
 ; do
     AC_TRY_COMPILE([#include <stdio.h>
 ],
@@ -1057,6 +1058,7 @@ else
     [for frend in	dnl
          _IO_read_end	dnl
          bufread 	dnl
+         __bufread 	dnl
     ; do
         AC_TRY_COMPILE([#include <stdio.h>
     ],