diff --git a/FAQ.md b/FAQ.md
index bf9fc0935f..c3a6aca6b0 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -2765,7 +2765,7 @@ The following extra variables are available:
 * *to* (array)
 * *subject* (string)
 * *text* (string)
-* *hasAttachments* (boolean)
+* *hasAttachments* (boolean; deprecated, use function *attachments()*)
 
 The following extra operators are available:
 
@@ -2775,7 +2775,10 @@ The following extra operators are available:
 The following extra functions are available:
 
 * *header(name)* (returns an array of header values for the named header)
-* *blocklist()* (returns a boolean indicating if the sender/server is on a DNS blocklist; since version 1.2176)
+* *blocklist()* (version 1.2176-1.2178; deprecated)
+* *onBlocklist()* (returns a boolean indicating if the sender/server is on a DNS blocklist; since version 1.2179)
+* *hasMx()* (returns boolean indicating if the from/reply-to address has an associated MX record; since version 1.2179)
+* *attachments()* (returns integer indicating number of attachments; since version 1.2179)
 
 Example condition:
 
diff --git a/index.html b/index.html
index 63a585f257..fb424a3dbc 100644
--- a/index.html
+++ b/index.html
@@ -1506,7 +1506,7 @@ X-Google-Original-From: Somebody &lt;somebody+extra@example.org&gt;</code></pre>
 <li><em>to</em> (array)</li>
 <li><em>subject</em> (string)</li>
 <li><em>text</em> (string)</li>
-<li><em>hasAttachments</em> (boolean)</li>
+<li><em>hasAttachments</em> (boolean; deprecated, use function <em>attachments()</em>)</li>
 </ul>
 <p>The following extra operators are available:</p>
 <ul>
@@ -1516,7 +1516,10 @@ X-Google-Original-From: Somebody &lt;somebody+extra@example.org&gt;</code></pre>
 <p>The following extra functions are available:</p>
 <ul>
 <li><em>header(name)</em> (returns an array of header values for the named header)</li>
-<li><em>blocklist()</em> (returns a boolean indicating if the sender/server is on a DNS blocklist; since version 1.2176)</li>
+<li><em>blocklist()</em> (version 1.2176-1.2178; deprecated)</li>
+<li><em>onBlocklist()</em> (returns a boolean indicating if the sender/server is on a DNS blocklist; since version 1.2179)</li>
+<li><em>hasMx()</em> (returns boolean indicating if the from/reply-to address has an associated MX record; since version 1.2179)</li>
+<li><em>attachments()</em> (returns integer indicating number of attachments; since version 1.2179)</li>
 </ul>
 <p>Example condition:</p>
 <p><code>header("X-Mailer") contains "Open-Xchange" &amp;&amp; from matches ".*service@.*" &amp;&amp; !hasAttachments</code></p>