diff --git a/Using-Mastodon/FAQ.md b/Using-Mastodon/FAQ.md
index 4b14c014..52635704 100644
--- a/Using-Mastodon/FAQ.md
+++ b/Using-Mastodon/FAQ.md
@@ -21,13 +21,17 @@ There are different ways in which something can be decentralized; in this case,
 
 #### Technically, how does the federation work?
 
-We are using the OStatus suite of protocols:
+Since Mastodon version 1.6 we use the [ActivityPub](https://www.w3.org/TR/activitypub/) protocol. Currently ActivityPub is a proposed W3C standard.
+
+Before version 1.6 we used the OStatus suite of protocols:
 
 1. Webfinger for user-on-domain lookup
 2. Atom feeds with ActivityStreams, Portable Contacts, Threads extensions for the actual content
 3. PubSubHubbub for subscribing to Atom feeds
 4. Salmon for delivering certain items from the Atom feeds to interested parties such as the mentioned user, author of the status being replied to, person being followed, etc
 
+We still use OStatus as an additional protocol for reasons of compatibility.
+
 #### What is mastodon.social?
 
 The "flagship" instance of Mastodon, aka the server I run myself with the latest code. It's not supposed to be the only instance in the end.