diff --git a/ChangeLog b/ChangeLog
index ddb02da670..95bea968b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 22 22:21:17 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_ssl_session.c: Respect T_BIGNUM time values. Patch by
+	  Tomoyuki Chikanaga.
+	  [ Ruby 1.9 - Bug #4919 ] [ruby-dev:43869]
+
 Wed Jun 22 21:29:25 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* ext/socket/depend (SOCK_HEADERS): use $(top_srcdir) instaed of
diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c
index 7b70207650..80abed7e67 100644
--- a/ext/openssl/ossl_ssl_session.c
+++ b/ext/openssl/ossl_ssl_session.c
@@ -149,7 +149,7 @@ static VALUE ossl_ssl_session_get_timeout(VALUE self)
 										\
 		if (rb_obj_is_instance_of(time_v, rb_cTime)) {			\
 			time_v = rb_funcall(time_v, rb_intern("to_i"), 0);	\
-		} else if (FIXNUM_P(time_v)) {					\
+		} else if (FIXNUM_P(time_v) || TYPE(time_v) == T_BIGNUM) {	\
 			;							\
 		} else {							\
 			ossl_raise(rb_eArgError, "unknown type");			\