diff --git a/templates/zerver/faq.html b/templates/zerver/faq.html
index 75ff543638..9c4c5bc285 100644
--- a/templates/zerver/faq.html
+++ b/templates/zerver/faq.html
@@ -64,6 +64,19 @@
                     support@zulipchat.com and we'll get you started!
                 </p>
             </div>
+            <div class="faq">
+                <div class="question">
+                    How are guest users billed?
+                </div>
+                <p class="answer">
+                    Guests cannot see or join streams they are not invited
+                    to. Guests subscribed to more than 1 stream are billed
+                    like regular users. Guests subscribed to a single stream
+                    are generally free, unless you have more than 5 times as
+                    many single-stream guests as paying users. More details
+                    are available <a href="/help/roles-and-permissions">here</a>.
+                </p>
+            </div>
             <div class="faq">
                 <div class="question">
                     Who can I contact if I have further questions?
diff --git a/templates/zerver/features.html b/templates/zerver/features.html
index 215f5434a1..3feccbe1a8 100644
--- a/templates/zerver/features.html
+++ b/templates/zerver/features.html
@@ -255,6 +255,14 @@
                 media profiles, food preferences, or anything else.
             </p>
         </div>
+        <div class="feature-block">
+            <h3>GUESTS</h3>
+            <p>
+                Guests cannot see or join streams unless they are explicitly
+                added. Perfect for partners, vendors, and temporary
+                contractors.
+            </p>
+        </div>
         <div class="feature-block">
             <h3>YOUR FEATURE HERE</h3>
             <p>Zulip is open source, so if something important for
diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md
index aa0950951d..e48527ca08 100644
--- a/templates/zerver/help/include/sidebar_index.md
+++ b/templates/zerver/help/include/sidebar_index.md
@@ -104,6 +104,7 @@
 * [Import from Slack](/help/import-from-slack)
 * [Import from Gitter](/help/import-from-gitter)
 * [Manage who can join](/help/manage-who-can-join-and-invite)
+* [Roles and permissions](/help/roles-and-permissions)
 * [Set the default language for new users](/help/change-the-default-language-for-your-organization)
 * [Export your organization](/help/export-your-organization)
 * [Moderating open organizations](/help/moderating-open-organizations)
diff --git a/templates/zerver/help/roles-and-permissions.md b/templates/zerver/help/roles-and-permissions.md
new file mode 100644
index 0000000000..5df7c72546
--- /dev/null
+++ b/templates/zerver/help/roles-and-permissions.md
@@ -0,0 +1,29 @@
+# Roles and permissions
+
+There are several roles in a Zulip organization.
+
+* **Organization Administrator**: Can manage users, public streams,
+  organization settings, and billing.
+
+* **Member**: Has access to all public streams. This is the default role for
+  most users.
+
+* **Guest**: Can only access streams they've been added to. Cannot create
+  new streams.
+
+## Billing and guests
+
+Guests are only available on Zulip on-premise and on paid plans for Zulip
+Cloud. There are two kinds of guest for billing purposes:
+
+* **Multi-stream guest**: Has been added to multiple streams. These guests
+  are billed the same as regular members.
+
+* **Single-stream guest**: Has been added to only a single stream. If you
+  have M paying users, you get 5M free single-stream guests. Similarly, if
+  you have G single stream guests, you'll get charged for G/5 users.
+
+  Example: You have 8 members, 2 multi-stream guests, and 50 single-stream
+  guests. You'll get charged for 10 users. Let's say you have 8 members, 2
+  multi-stream guests, and 51 single-stream guests. You'll get charged for
+  11 users.
diff --git a/templates/zerver/plans.html b/templates/zerver/plans.html
index 3a14ec1a9f..e2a7193d86 100644
--- a/templates/zerver/plans.html
+++ b/templates/zerver/plans.html
@@ -68,7 +68,7 @@
                                     <li>Full search history</li>
                                     <li>File storage up to 10 GB per user</li>
                                     <li>Full access to enterprise features
-                                    like Google and GitHub OAuth</li>
+                                    like guest users and user groups</li>
                                     <li>Priority commercial support</li>
                                     <li>Funds the Zulip open source project</li>
                                 </ul>