diff --git a/ChangeLog b/ChangeLog
index 5d7f2d549f..9248e7cd6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Sep 12 20:53:06 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* test/openssl/test_pkcs7.rb (test_enveloped): skip this test
+	  to avoid a bug of PKCS7_enctypt() (only if ext/openssl is
+	  compiled with OpenSSL-0.9.7d or earlier versions).
+	  http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
+
 Mon Sep 12 14:03:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* test/dbm/test_dbm.rb: remove locking test, which may not be
diff --git a/test/openssl/test_pkcs7.rb b/test/openssl/test_pkcs7.rb
index a2153af363..9b472c1795 100644
--- a/test/openssl/test_pkcs7.rb
+++ b/test/openssl/test_pkcs7.rb
@@ -125,6 +125,12 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase
   end
 
   def test_enveloped
+    if OpenSSL::OPENSSL_VERSION_NUMBER <= 0x0090704f
+      # PKCS7_encrypt() of OpenSSL-0.9.7d goes to SEGV.
+      # http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
+      return
+    end
+
     certs = [@ee1_cert, @ee2_cert]
     cipher = OpenSSL::Cipher::AES.new("128-CBC")
     data = "aaaaa\nbbbbb\nccccc\n"