diff --git a/doc/components.rst b/doc/components.rst
index 36d3b5fe..8fef924c 100644
--- a/doc/components.rst
+++ b/doc/components.rst
@@ -969,6 +969,20 @@ from the gateway (using `XEP-0498 (PubSub File Sharing)`_).
    and deleted, they are not yet sent with the message. This functionality will be added
    as development progresses.
 
+End-to-End Encryption
+~~~~~~~~~~~~~~~~~~~~~
+
+The gateway supports end-to-end encryption through the Gateway Relayed Encryption
+specification. This works by indicating to client how to format and encrypt the message
+(in technical terms, it's by telling it to use MIME and OpenPGP) before sending it to the
+gateway. This only works with clients implementing this specification.
+
+
+.. note::
+
+   Gateway Relayed Encryption is not yet an official XEP, it will be evaluated by XMPP
+   council to see if it gets an official number in coming weeks.
+
 
 .. _XEP-0033 (Extended Stanza Addressing): https://xmpp.org/extensions/xep-0033.html
 .. _XEP-0100 (Gateway Interaction): https://xmpp.org/extensions/xep-0100.html