diff --git a/templates/zerver/team.html b/templates/zerver/team.html
index de9b443d97..a48b6e0ce3 100644
--- a/templates/zerver/team.html
+++ b/templates/zerver/team.html
@@ -22,21 +22,27 @@
     <div class="hero bg-pycon drone">
         <div class="bg-dimmer"></div>
         <div class="content">
-            <h1 class="center">About the Zulip project</h1>
-            <p>Learn about the history of the Zulip project and community!</p>
+            <h1 class="center">The Zulip team</h1>
+            <p>Learn about the people behind Zulip!</p>
         </div>
     </div>
 
     <div class="main">
         <div class="team">
-            <h1>The Team</h1>
-            <h2>Zulip Core Team</h2>
+            <h1>The core team at Kandra Labs</h1>
             <p>
-                Over 350 people have contributed to the Zulip codebase, from
-                high school students to 30 year industry veterans, from people
-                launching new careers to people looking for community.  Meet
-                the leadership below.
+                Over 350 people have contributed to the Zulip
+                codebase, from high school students to 30 year
+                industry veterans, from people launching new careers
+                to people looking for community.
+
+                The <a href="https://zulipchat.com/plans">commercial
+                services for Zulip</a> are offered by Kandra Labs.
+                Kandra Labs is funded by an NSF SBIR grant, and
+                employs most of the Zulip core team.  Meet the
+                leadership below!
             </p>
+
             <div class="team-profiles">
                 <!-- Tim -->
                 <div class="profile bdfl">
@@ -95,14 +101,20 @@
             </div>
 
             <div class="contributors">
-                <h2>Contributors</h2>
+                <h1>Our amazing community</h1>
                 <p>
-                    Zulip is built from the work of many enthusiastic
-                    developers from all around the world.
+                    While the team at Kandra Labs provides important
+                    leadership, Zulip is built by an incredible
+                    distributed community of developers from all
+                    around the world.  You can read about
+                    the <a href="/history">project's history</a> if
+                    you want to learn more about Zulip's origins.
                 </p>
                 <p>
-                    Below, we recognize the top 100 contributors to
-                    the Zulip server project on GitHub.
+                    Here, we recognize the top contributors to the
+                    Zulip server project on GitHub!  Zulip's community
+                    in unusual in how many people outside the core
+                    team have made major contributions to the project.
                 </p>
 
                 {% for row in data %}
diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py
index 6b4eeb379a..0718cc74cc 100644
--- a/zerver/tests/test_docs.py
+++ b/zerver/tests/test_docs.py
@@ -56,7 +56,7 @@ class DocPageTest(ZulipTestCase):
         self._test('/api-new/', 'We hear you like APIs')
         self._test('/api-new/api-keys', 'you can use its email and API key')
         self._test('/api-new/installation-instructions', 'Python Installation')
-        self._test('/team/', '30 year industry veterans')
+        self._test('/team/', 'industry veterans')
         self._test('/history/', 'Cambridge, Massachusetts')
         # Test the i18n version of one of these pages.
         self._test('/en/history/', 'Cambridge, Massachusetts')
@@ -186,7 +186,7 @@ class AboutPageTest(ZulipTestCase):
         # type: () -> None
         result = self.client_get('/team/')
         self.assert_in_success_response(
-            ['Contributors', 'commits', '@timabbott'],
+            ['Our amazing community', 'commits', '@timabbott'],
             result
         )