diff --git a/doc/faq.rst b/doc/faq.rst
index fbd1cc6c7d..3bfb0d0521 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -520,8 +520,8 @@ error log file might give a clue.
 -----------------------------------------------------------------------------------------------------------
 
 If your cluster consist of different architectures, PHP code used for
-encryption/decryption won't work correct. This is caused by use of
-pack/unpack functions in code. Only solution is to use mcrypt
+encryption/decryption won't work correctly. This is caused by use of
+pack/unpack functions in code. Only solution is to use openssl
 extension which works fine in this case.
 
 .. _faq1_38:
diff --git a/doc/glossary.rst b/doc/glossary.rst
index e117ff5987..8966b3f1e1 100644
--- a/doc/glossary.rst
+++ b/doc/glossary.rst
@@ -210,16 +210,6 @@ From Wikipedia, the free encyclopedia
 
        .. seealso:: <https://www.php.net/manual/en/book.mbstring.php>
 
-    MCrypt
-      a cryptographic library.
-
-      .. seealso:: <https://en.wikipedia.org/wiki/MCrypt>
-
-    mcrypt
-      the MCrypt PHP extension.
-
-      .. seealso:: <https://www.php.net/mcrypt>
-
     Media type
       A media type (formerly known as MIME type) is a two-part identifier
       for file formats and format contents transmitted on the Internet.
diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
index 7a794d09f2..a4835819f2 100644
--- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
@@ -788,7 +788,7 @@ class AuthenticationCookie extends AuthenticationPlugin
 
     /**
      * Encryption using openssl's AES or phpseclib's AES
-     * (phpseclib uses mcrypt when it is available)
+     * (phpseclib uses anoher extension when it is available)
      *
      * @param string $data   original data
      * @param string $secret the secret
@@ -827,7 +827,7 @@ class AuthenticationCookie extends AuthenticationPlugin
 
     /**
      * Decryption using openssl's AES or phpseclib's AES
-     * (phpseclib uses mcrypt when it is available)
+     * (phpseclib uses anoher extension when it is available)
      *
      * @param string $encdata encrypted data
      * @param string $secret  the secret
diff --git a/test/php.ini b/test/php.ini
index 52f47045d0..462475381d 100644
--- a/test/php.ini
+++ b/test/php.ini
@@ -1748,17 +1748,6 @@ soap.wsdl_cache_limit = 5
 ; Sets the maximum number of open links or -1 for unlimited.
 ldap.max_links = -1
 
-[mcrypt]
-; For more information about mcrypt settings see http://php.net/mcrypt-module-open
-
-; Directory where to load mcrypt algorithms
-; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
-;mcrypt.algorithms_dir=
-
-; Directory where to load mcrypt modes
-; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
-;mcrypt.modes_dir=
-
 [dba]
 ;dba.default_handler=