diff --git a/ChangeLog b/ChangeLog
index e23b87c3eb..17a0dd6076 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan  6 09:23:33 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/net/protocol.rb (eof?): BufferedIO should proxy eof? to the
+	  underlying IO object.
+
 Thu Jan  6 09:12:31 2011  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* lib/mkmf.rb (configuration): fixing gsub when multiple error flags
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index a3ffa71745..f908f3a1d6 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -62,6 +62,10 @@ module Net # :nodoc:
       "#<#{self.class} io=#{@io}>"
     end
 
+    def eof?
+      @io.eof?
+    end
+
     def closed?
       @io.closed?
     end
diff --git a/test/net/http/test_buffered_io.rb b/test/net/http/test_buffered_io.rb
new file mode 100644
index 0000000000..e24e7c1ed9
--- /dev/null
+++ b/test/net/http/test_buffered_io.rb
@@ -0,0 +1,17 @@
+require 'test/unit'
+require 'net/http'
+require 'stringio'
+
+require_relative 'utils'
+
+module Net
+  class TestBufferedIO < Test::Unit::TestCase
+    def test_eof?
+      s = StringIO.new
+      assert s.eof?
+      bio = BufferedIO.new(s)
+      assert_equal s, bio.io
+      assert_equal s.eof?, bio.eof?
+    end
+  end
+end