diff --git a/ChangeLog b/ChangeLog
index c1f1da233e..c0eb46044a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Aug  7 22:51:45 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/openssl/ossl_asn1.c (decode_eoc): remove unused variables.
+	  Patch by Eric Wong. [Feature #5157] [ruby-core:38798]
+	* ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
+	* ext/openssl/ossl_pkey.c (ossl_pkey_new_from_data): ditto.
+
 Sun Aug  7 22:37:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* configure.in: add -Wunused-variable to default CFLAGS.
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index 3f50933aa4..7855b2ceb3 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -467,7 +467,6 @@ decode_time(unsigned char* der, int length)
 static VALUE
 decode_eoc(unsigned char *der, int length)
 {
-    VALUE ret;
     if (length != 2 || !(der[0] == 0x00 && der[1] == 0x00))
 	ossl_raise(eASN1Error, NULL);
 
@@ -1036,7 +1035,7 @@ ossl_asn1_traverse(VALUE self, VALUE obj)
 static VALUE
 ossl_asn1_decode(VALUE self, VALUE obj)
 {
-    VALUE ret, ary;
+    VALUE ret;
     unsigned char *p;
     volatile VALUE tmp;
     long len, read = 0, offset = 0;
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index 43812daa9c..b8480de0eb 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -101,7 +101,6 @@ ossl_pkey_new_from_file(VALUE filename)
 static VALUE
 ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self)
 {
-     FILE *fp;
      EVP_PKEY *pkey;
      BIO *bio;
      VALUE data, pass;