diff --git a/CHANGES b/CHANGES
index 7c308011c5f1cfcc8b9f3df860d1d75e0bc1cb97..60af919fe921d614796df4a8085c795597bb9a9f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.6 and 0.9.7  [xx XXX 2000]
 
+  *) Make it so the openssl application has all engines loaded by default.
+     [Richard Levitte]
+
   *) Constify the BIGNUM routines a little more.
      [Richard Levitte]
 
diff --git a/apps/apps.h b/apps/apps.h
index e8272a39738c640f29bb8ca64c9bbdf674871d63..11133cb1d290f8af1856db6802eaaa1a3a2bff72 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -122,14 +122,16 @@ extern BIO *bio_err;
 #    ifdef _O_BINARY
 #      define apps_startup() \
 		_fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-		SSLeay_add_all_algorithms()
+		SSLeay_add_all_algorithms(); ENGINE_load_builtin_engines()
 #    else
 #      define apps_startup() \
 		_fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-		SSLeay_add_all_algorithms()
+		SSLeay_add_all_algorithms(); ENGINE_load_builtin_engines()
 #    endif
 #  else
-#    define apps_startup()	do_pipe_sig(); SSLeay_add_all_algorithms();
+#    define apps_startup() \
+		do_pipe_sig(); SSLeay_add_all_algorithms(); \
+		ENGINE_load_builtin_engines()
 #  endif
 #endif
 
diff --git a/apps/engine.c b/apps/engine.c
index ca5618b1a69c66619fd5824b4a912190a6e16bfc..f11206f570833367b2b56412b8e52d998db1b709 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -73,11 +73,8 @@
 static char *engine_usage[]={
 "usage: engine opts [engine ...]\n",
 " -v          - verbose mode, a textual listing of the engines in OpenSSL\n",
-#if 0
 " -c          - for each engine, also list the capabilities\n",
-#endif
 " -t          - for each engine, check that they are really available\n",
-" -l          - load all built-in engines\n",
 NULL
 };
 
@@ -153,8 +150,6 @@ int MAIN(int argc, char **argv)
 			list_cap=1;
 		else if (strcmp(*argv,"-t") == 0)
 			test_avail=1;
-		else if (strcmp(*argv,"-l") == 0)
-			ENGINE_load_builtin_engines();
 		else if ((strncmp(*argv,"-h",2) == 0) ||
 			 (strcmp(*argv,"-?") == 0))
 			{
diff --git a/apps/openssl.c b/apps/openssl.c
index 4f61006b73bf95bf0bbb11f4709980fd44d044c6..cbb77b0c0a8404c9ea2e034441bdca5a2387f90b 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -112,6 +112,7 @@ int main(int Argc, char *Argv[])
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	ERR_load_crypto_strings();
+	ENGINE_load_builtin_engines();
 
 	/* Lets load up our environment a little */
 	p=getenv("OPENSSL_CONF");