diff --git a/ChangeLog b/ChangeLog
index 2179103f95..eb44f8b466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May  8 07:44:18 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_start_ssl): remove useless rb_sys_fail
+	  before ossl_raise. this cause a test failure on Linux.
+	  http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T190102Z.log.html.gz
+
 Tue May  8 05:35:18 2012  Eric Hodel  <drbrain@segment7.net>
 
 	* object.c (Init_Object):  Added reference to variable.c where
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index d375b0ff67..d285e58a82 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -1158,7 +1158,6 @@ ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, int nonblock)
             rb_io_wait_readable(FPTR_TO_FD(fptr));
             continue;
 	case SSL_ERROR_SYSCALL:
-	    if (errno) rb_sys_fail(funcname);
 	    ossl_raise(eSSLError, "%s SYSCALL returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
 	default:
 	    ossl_raise(eSSLError, "%s returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));