diff --git a/documentation/xeps.md b/documentation/xeps.md
index 84eb9ce..8af2e13 100644
--- a/documentation/xeps.md
+++ b/documentation/xeps.md
@@ -15,6 +15,7 @@ Mercury currently has explicit support for the following XEPs:
 * [XEP-0237: Roster Versioning](https://xmpp.org/extensions/xep-0237.html)
 * [XEP-0280: Message Carbons](https://xmpp.org/extensions/xep-0280.html)
 * [XEP-0352: Client State Indication](https://xmpp.org/extensions/xep-0352.html)
+* [XEP-0359: Stable and Unique Stanza IDs](https://xmpp.org/extensions/xep-0359.html) see [comments](#comments)
 * [XEP-0392: Consistent Color Generation](https://xmpp.org/extensions/xep-0392.html)
 
 
@@ -33,7 +34,6 @@ The following XEPs are on the TODO list:
 * [XEP-0249: Direct MUC Invitations](https://xmpp.org/extensions/xep-0249.html)
 * [XEP-0308: Last Message Correction](https://xmpp.org/extensions/xep-0308.html)
 * [XEP-0313: Message Archive Management](https://xmpp.org/extensions/xep-0313.html)
-* [XEP-0359: Stable and Unique Stanza IDs](https://xmpp.org/extensions/xep-0359.html)
 * [XEP-0363: HTTP File Upload](https://xmpp.org/extensions/xep-0363.html)
 * [XEP-0373](https://xmpp.org/extensions/xep-0373.html), [XEP-0374: OpenPGP for XMPP](https://xmpp.org/extensions/xep-0374.html)
 * [XEP-0384: OMEMO Encryption](https://xmpp.org/extensions/xep-0384.html)
@@ -54,4 +54,5 @@ The following XEPs are *not* currently on the TODO list:
 * XEP-0071: XEP is deprecated and considered a potential security risk
 * XEP-0080: Presumably in form of an addon?
 * XEP-0084: Work is currently done [upstream in Smack](https://github.com/igniterealtime/Smack/pull/332)
-* XEP-0357: Mercury embraces decentralization and independence. This is not compatible with being functionally dependent on centralized push services.
\ No newline at end of file
+* XEP-0357: Mercury embraces decentralization and independence. This is not compatible with being functionally dependent on centralized push services.
+* XEP-0359: Currently broken upstream, but a [fix](https://github.com/igniterealtime/Smack/pull/344) is submitted