diff --git a/CHANGES b/CHANGES
index 6b5e116c3..7005f1cd8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -96,6 +96,11 @@
   
  Changes between 1.0.0 and 1.0.1  [xx XXX xxxx]
 
+  *) Add call to ENGINE_register_all_complete() to
+     ENGINE_load_builtin_engines(), so some implementations get used
+     automatically instead of needing explicit application support.
+     [Steve Henson]
+
   *) Add support for TLS key exporter as described in RFC5705.
      [Robin Seggelmann <seggelmann@fh-muenster.de>, Steve Henson]
 
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index b03fa4786..5cd2d87f6 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -61,6 +61,8 @@
 
 void ENGINE_load_builtin_engines(void)
 	{
+	/* Some ENGINEs need this */
+	OPENSSL_cpuid_setup();
 #if 0
 	/* There's no longer any need for an "openssl" ENGINE unless, one day,
 	 * it is the *only* way for standard builtin implementations to be be
@@ -115,6 +117,7 @@ void ENGINE_load_builtin_engines(void)
 	ENGINE_load_capi();
 #endif
 #endif
+	ENGINE_register_all_complete();
 	}
 
 #if defined(__OpenBSD__) || defined(__FreeBSD__)