diff --git a/ChangeLog b/ChangeLog
index 8b2c7bd920..37858c2b86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 03 08:36:00 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_engine.rb: call Engine::cleanup on exit.
+	  Patch provided by Yui Naruse, thanks!
+	  [Bug #5547] [ruby-core:40669]
+
 Wed Nov  2 21:36:00 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* complex.c (nucomp_rationalize): fix function.  [ruby-core:40667]
diff --git a/test/openssl/test_engine.rb b/test/openssl/test_engine.rb
index 6d90e34398..9258775bd3 100644
--- a/test/openssl/test_engine.rb
+++ b/test/openssl/test_engine.rb
@@ -8,6 +8,7 @@ class OpenSSL::TestEngine < Test::Unit::TestCase
     OpenSSL::Engine.load
     OpenSSL::Engine.engines
     OpenSSL::Engine.engines
+    OpenSSL::Engine.cleanup # [ruby-core:40669]
   end
 
 end