diff --git a/ChangeLog b/ChangeLog
index 4b5a1058a3..3f933aad90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat May 21 12:40:36 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/lib/openssl/buffering.rb (read_nonblock, readpartial):
+	  Remove impossible EOFError raise. Patch by Zach Anker
+	  <zanker@squareup.com>.  [GH ruby/openssl#23]
+
 Sat May 21 11:18:42 2016  Evgeni Golov  <evgeni@golov.de>
 
 	* lib/ipaddr.rb: [DOC] fix documentation of IN6MASK to mention
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index d082199000..61e1f43e00 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -132,7 +132,6 @@ module OpenSSL::Buffering
       buf.replace(ret)
       ret = buf
     end
-    raise EOFError if ret.empty?
     ret
   end
 
@@ -182,7 +181,6 @@ module OpenSSL::Buffering
       buf.replace(ret)
       ret = buf
     end
-    raise EOFError if ret.empty?
     ret
   end