diff --git a/developer/name-server-protocol.md b/developer/name-server-protocol.md
index fc4ec121336ea32f08ef846e0b8310f97e1dfd4d..841e0b8bae5886efdbb0e1cf8a3a40bb84467f6d 100644
--- a/developer/name-server-protocol.md
+++ b/developer/name-server-protocol.md
@@ -11,6 +11,11 @@ The public nameserver is hosted at `ns.jami.net` and uses a blockchain
 as its backend.  Another implementation could use any other database
 or directory service making the nameserver protocol reusable.
 
+If you run your own nameserver, looking up a username in the form of
+`username@example.com` will look up the name `username` with the
+nameserver at `example.com`.  (There is no need to add `@ns.jami.net`
+to use the default nameserver.)
+
 Rules on name formatting
 ------------------------
 
diff --git a/user/faq.rst b/user/faq.rst
index 64d25ff094d401ccbc1928401a3e5e965223dee9..aea8e8ed97ec4f06b7d0d5802e97aa1b2cac41f0 100644
--- a/user/faq.rst
+++ b/user/faq.rst
@@ -281,6 +281,9 @@ one at ``ns.jami.net``.
 If you don't register a username, you can still choose to register one
 later at any time.
 
+If you host your own nameserver at ``example.com``, usernames registered
+there can be looked up by searching for ``username@example.com``.
+
 Can I change my username?
 ~~~~~~~~~~~~~~~~~~~~~~~~~