diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 264b3f1bb..09e1f1803 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -20,10 +20,14 @@ Changelog
   Message forwarding was before a default behavior but is now optional (and disabled by default). [jcbrand]
 * Newly opened chat boxes always appear immediately left of the controlbox. [jcbrand]
 * #71 Chat boxes and rooms can be minimized. [jcbrand]
+* #83 Roster contacts can be shown according to their groups. [jcbrand]
+    Note: Converse.js can show users under groups if you have assigned them
+    already via another client or server configuration. There is not yet a way
+    to assign contacts to groups from within converse.js itself.
 * #123 Show converse.js in the resource assigned to a user. [jcbrand]
 * #130 Fixed bootstrap conflicts. [jcbrand]
 * #132 Support for `XEP-0280: Message Carbons <https://xmpp.org/extensions/xep-0280.html'>`_.
-  Configured via `message_carbons <https://conversejs.org/docs/html/index.html#message_carbons>`_ [hejazee]
+    Configured via `message_carbons <https://conversejs.org/docs/html/index.html#message_carbons>`_ [hejazee]
 * #176 Add support for caching in sessionStorage as opposed to localStorage. [jcbrand]
 * #180 RID and SID undefined [g8g3]
 * #191 No messages history [heban]
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 6c0bbe084..06fc47e7a 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -1001,6 +1001,18 @@ values as ``jid``, ``sid``, ``rid``.
 
 Additionally, you have to specify ``bosh_service_url``.
 
+roster_groups
+-------------
+
+Default:  ``false``
+
+If set to ``true``, converse.js will show any roster groups you might have
+configured.
+
+.. Note ::
+    It's currently not possible to use converse.js to assign contacts to groups.
+    Converse.js can only show users and groups that were previously configured
+    elsewhere.
 
 show_controlbox_by_default
 --------------------------