diff --git a/ChangeLog b/ChangeLog
index 327dcb1064..4c0e0c8229 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 19 17:32:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): store the
+	  result of d2i_X509_NAME into DATA_PTR(self).
+
 Tue Aug 19 04:54:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rake.rb (FileUtils#ruby): takes care of space containing path.
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index 8d80cd5986..58e2487485 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -143,6 +143,7 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
 	    if(!d2i_X509_NAME(&x, &p, RSTRING_LEN(str)) && (DATA_PTR(self) = x, 1)){
 		ossl_raise(eX509NameError, NULL);
 	    }
+            DATA_PTR(self) = x;
 	}
     }