diff --git a/ChangeLog b/ChangeLog
index 221befbb0c..40f8edfff7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun  6 17:10:50 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_free): Use EVP_CIPHER_CTX_free()
+	  to free EVP_CIPHER_CTX allocated by EVP_CIPHER_CTX_new().
+	  [ruby-core:75225] [Feature #12324]
+
 Mon Jun  6 13:37:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* string.c Change rb_str_casemap to use encoding primitive
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index 54e363faa2..e1408b9198 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -81,11 +81,7 @@ ossl_cipher_new(const EVP_CIPHER *cipher)
 static void
 ossl_cipher_free(void *ptr)
 {
-    EVP_CIPHER_CTX *ctx = ptr;
-    if (ctx) {
-	EVP_CIPHER_CTX_cleanup(ctx);
-	ruby_xfree(ctx);
-    }
+    EVP_CIPHER_CTX_free(ptr);
 }
 
 static VALUE