diff --git a/CHANGES b/CHANGES
index 40b58239d5db481cd789db3c31d0277c86ed3126..e5f6cb6c9d1c0321c5edfaae912982b843ac4d05 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,9 @@
      in libcrypto when run as setuid/setgid.
      [Bernd Edlinger]
 
+  *) Load any config file by default when libssl is used.
+     [Matt Caswell]
+
   *) Added new public header file <openssl/rand_drbg.h> and documentation
      for the RAND_DRBG API. See manual page RAND_DRBG(7) for an overview.
      [Matthias St. Pierre]
diff --git a/doc/man3/OPENSSL_init_crypto.pod b/doc/man3/OPENSSL_init_crypto.pod
index ce7497e1b0dc52db7883efcf74a5d28c30789fa4..c6a17154a4b26eb2154ef69a5d2eb4cfdb4ef771 100644
--- a/doc/man3/OPENSSL_init_crypto.pod
+++ b/doc/man3/OPENSSL_init_crypto.pod
@@ -95,8 +95,10 @@ B<OPENSSL_INIT_ADD_ALL_DIGESTS> will be ignored.
 =item OPENSSL_INIT_LOAD_CONFIG
 
 With this option an OpenSSL configuration file will be automatically loaded and
-used by calling OPENSSL_config(). This is not a default option.
-See the description of OPENSSL_INIT_new(), below.
+used by calling OPENSSL_config(). This is not a default option for libcrypto.
+From OpenSSL 1.1.1 this is a default option for libssl (see
+L<OPENSSL_init_ssl(3)> for further details about libssl initialisation). See the
+description of OPENSSL_INIT_new(), below.
 
 =item OPENSSL_INIT_NO_LOAD_CONFIG