diff --git a/ChangeLog b/ChangeLog
index 0afaf4b5b2..018d103423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 31 14:08:43 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
+	  value. [ruby-dev:25971]
+
 Thu Mar 31 11:07:50 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/parser.rb: @@setter -> @@setters.
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
index 5b58c4f1e6..c3f3dc4014 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -55,7 +55,10 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
     VALUE name;
 
     rb_scan_args(argc, argv, "01", &name);
-    if(NIL_P(name)) ENGINE_load_builtin_engines();
+    if(NIL_P(name)){
+        ENGINE_load_builtin_engines();
+        return Qtrue;
+    }
     StringValue(name);
     OSSL_ENGINE_LOAD_IF_MATCH(openssl);
     OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
@@ -70,7 +73,8 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
 #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
     OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
 #endif
-    rb_warning("no such engine `%s'", RSTRING(name)->ptr);
+    rb_warning("no such builtin loader for `%s'", RSTRING(name)->ptr);
+    return Qnil;
 #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
 }