diff --git a/docs/development.rst b/docs/development.rst
index 7dc2941ac..338d6432b 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -292,7 +292,7 @@ Checklist:
 - announce on:
 
  - Mailing list
- - Twitter (follow @ThomasJWaldmann for these tweets)
+ - Twitter
  - IRC channel (change ``/topic``)
 
 - create a Github release, include:
diff --git a/docs/support.rst b/docs/support.rst
index 293264f51..8bd3fcbed 100644
--- a/docs/support.rst
+++ b/docs/support.rst
@@ -38,6 +38,15 @@ unsubscribe and where you can find the archives of the list, see the
 `mailing list homepage
 <https://mail.python.org/mailman/listinfo/borgbackup>`_.
 
+Twitter
+-------
+
+Follow @borgbackup for announcements. You can also add @borgbackup if you
+would like to get retweeted for a borg related tweet.
+
+Please understand that Twitter is not suitable for longer / more complex
+discussions - use one of the other channels for that.
+
 Bounties and Fundraisers
 ------------------------