diff --git a/site/_data/core-team.yml b/site/_data/core-team.yml
new file mode 100644
index 0000000000..46880ec8a5
--- /dev/null
+++ b/site/_data/core-team.yml
@@ -0,0 +1,31 @@
+- name: Mark Otto
+  user: mdo
+  gravatar: bc4ab438f7a4ce1c406aadc688427f2c
+
+- name: Jacob Thornton
+  user: fat
+  gravatar: a98244cbdacaf1c0b55499466002f7a8
+
+- name: Chris Rebert
+  user: cvrebert
+  gravatar: edec428c425453955f770095a7d26c50
+
+- name: XhmikosR
+  user: xhmikosr
+  gravatar: e37759b1ea0125d4e97b1e00b5eed26f
+
+- name: Patrick H. Lauke
+  user: patrickhlauke
+  gravatar: 357f279672db832fc41a5a2f36559fcb
+
+- name: Gleb Mazovetskiy
+  user: glebm
+  gravatar: 729f685b8e8d7e9feed18c177c82e59b
+
+- name: Johann-S
+  user: johann-s
+  gravatar: d90d49733a4fe1aa461e45cb4a4fd9e3
+
+- name: Andres Galante
+  user: andresgalante
+  gravatar: 03dc4f2e26e476958c952505c8d8f563
diff --git a/site/_data/nav.yml b/site/_data/nav.yml
index 98bd2c5d5e..99cb90f849 100644
--- a/site/_data/nav.yml
+++ b/site/_data/nav.yml
@@ -81,6 +81,7 @@
 - title: About
   pages:
     - title: Overview
+    - title: Team
     - title: Brand
     - title: License
     - title: Translations
diff --git a/site/docs/4.1/about/overview.md b/site/docs/4.1/about/overview.md
index 23dd7affe0..cfc9102949 100644
--- a/site/docs/4.1/about/overview.md
+++ b/site/docs/4.1/about/overview.md
@@ -5,7 +5,6 @@ description: Learn more about the team maintaining Bootstrap, how and why the pr
 redirect_from:
   - "/docs/4.1/about/"
   - "/docs/4.1/history/"
-  - "/docs/4.1/team/"
 group: about
 ---
 
diff --git a/site/docs/4.1/about/team.md b/site/docs/4.1/about/team.md
new file mode 100644
index 0000000000..d34c5b6f4d
--- /dev/null
+++ b/site/docs/4.1/about/team.md
@@ -0,0 +1,22 @@
+---
+layout: docs
+title: Team
+description: An overview of the founding team and core contributors to Bootstrap.
+group: about
+---
+
+Bootstrap is maintained by the founding team and a small group of invaluable core contributors, with the massive support and involvement of our community.
+
+<div class="list-group bd-team">
+  {% for member in site.data.core-team %}
+    <div class="list-group-item">
+      <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user={{ member.user }}&amp;type=follow"></iframe>
+      <a class="team-member" href="https://github.com/{{ member.user }}">
+        <img src="https://secure.gravatar.com/avatar/{{ member.gravatar }}" alt="@{{ member.user }}" width="32" height="32">
+        <strong>{{ member.name }}</strong> <small>@{{ member.user }}</small>
+      </a>
+    </div>
+  {% endfor %}
+</div>
+
+Get involved with Bootstrap development by [opening an issue]({{ site.repo }}/issues/new) or submitting a pull request. Read our [contributing guidelines]({{ site.repo }}/blob/v{{ site.current_version }}/.github/CONTRIBUTING.md) for information on how we develop.
diff --git a/site/docs/4.1/assets/scss/_team.scss b/site/docs/4.1/assets/scss/_team.scss
new file mode 100644
index 0000000000..5f6229bd31
--- /dev/null
+++ b/site/docs/4.1/assets/scss/_team.scss
@@ -0,0 +1,32 @@
+.bd-team {
+  margin-bottom: 1.5rem;
+
+  .team-member {
+    line-height: 2rem;
+    color: #555;
+  }
+
+  .team-member:hover,
+  .team-member:focus {
+    color: #333;
+  }
+
+  .team-member:hover {
+    text-decoration: none;
+  }
+
+  .github-btn {
+    float: right;
+    width: 180px;
+    height: 1.25rem;
+    margin-top: .25rem;
+    border: 0;
+  }
+
+  img {
+    float: left;
+    width: 2rem;
+    margin-right: .5rem;
+    border-radius: .25rem;
+  }
+}
diff --git a/site/docs/4.1/assets/scss/docs.scss b/site/docs/4.1/assets/scss/docs.scss
index 706bde44e6..cb835614ef 100644
--- a/site/docs/4.1/assets/scss/docs.scss
+++ b/site/docs/4.1/assets/scss/docs.scss
@@ -41,6 +41,7 @@
 @import "buttons";
 @import "callouts";
 @import "examples";
+@import "team";
 @import "browser-bugs";
 @import "brand";
 @import "colors";