diff --git a/web/pandas/about/team.md b/web/pandas/about/team.md
index 7a19fd7af6595..c6a05d6c1f770 100644
--- a/web/pandas/about/team.md
+++ b/web/pandas/about/team.md
@@ -29,6 +29,29 @@ If you want to support pandas development, you can find information in the [dona
     {% endfor %}
 </div>
 
+## Maintainers of `pandas-stubs`
+
+<div class="card-group maintainers">
+    {% for username in maintainers.pandasstubs %}
+        {% set person = maintainers.github_info.get(username) %}
+        <div class="card">
+            <img class="card-img-top" alt="" src="{{ person.avatar_url }}"/>
+            <div class="card-body">
+                <h6 class="card-title">
+                    {% if person.blog %}
+                        <a href="{{ person.blog }}">
+                            {{ person.name or person.login }}
+                        </a>
+                    {% else %}
+                        {{ person.name or person.login }}
+                    {% endif %}
+                </h6>
+                <p class="card-text small"><a href="{{ person.html_url }}">{{ person.login }}</a></p>
+            </div>
+        </div>
+    {% endfor %}
+</div>
+
 ## Diversity and Inclusion
 
 > _pandas_ expressly welcomes and encourages contributions from anyone who faces under-representation, discrimination in the technology industry
diff --git a/web/pandas/config.yml b/web/pandas/config.yml
index 3ff22d574f171..4cb4ad0f48c5b 100644
--- a/web/pandas/config.yml
+++ b/web/pandas/config.yml
@@ -3,58 +3,58 @@ main:
   base_template: "layout.html"
   production_url: "https://pandas.pydata.org/"
   ignore:
-  - _templates/layout.html
-  - config.yml
+    - _templates/layout.html
+    - config.yml
   github_repo_url: pandas-dev/pandas
   context_preprocessors:
-  - pandas_web.Preprocessors.current_year
-  - pandas_web.Preprocessors.navbar_add_info
-  - pandas_web.Preprocessors.blog_add_posts
-  - pandas_web.Preprocessors.maintainers_add_info
-  - pandas_web.Preprocessors.home_add_releases
-  - pandas_web.Preprocessors.roadmap_pdeps
+    - pandas_web.Preprocessors.current_year
+    - pandas_web.Preprocessors.navbar_add_info
+    - pandas_web.Preprocessors.blog_add_posts
+    - pandas_web.Preprocessors.maintainers_add_info
+    - pandas_web.Preprocessors.home_add_releases
+    - pandas_web.Preprocessors.roadmap_pdeps
   markdown_extensions:
-  - tables
-  - fenced_code
-  - meta
-  - footnotes
-  - codehilite
+    - tables
+    - fenced_code
+    - meta
+    - footnotes
+    - codehilite
 static:
   logo: static/img/pandas_white.svg
   css:
-  - static/css/pandas.css
-  - static/css/codehilite.css
+    - static/css/pandas.css
+    - static/css/codehilite.css
 navbar:
   - name: "About us"
     target:
-    - name: "About pandas"
-      target: about/
-    - name: "Project roadmap"
-      target: about/roadmap.html
-    - name: "Governance"
-      target: about/governance.html
-    - name: "Team"
-      target: about/team.html
-    - name: "Sponsors"
-      target: about/sponsors.html
-    - name: "Citing and logo"
-      target: about/citing.html
+      - name: "About pandas"
+        target: about/
+      - name: "Project roadmap"
+        target: about/roadmap.html
+      - name: "Governance"
+        target: about/governance.html
+      - name: "Team"
+        target: about/team.html
+      - name: "Sponsors"
+        target: about/sponsors.html
+      - name: "Citing and logo"
+        target: about/citing.html
   - name: "Getting started"
     target: getting_started.html
   - name: "Documentation"
     target: docs/
   - name: "Community"
     target:
-    - name: "Blog"
-      target: community/blog/
-    - name: "Ask a question (StackOverflow)"
-      target: https://stackoverflow.com/questions/tagged/pandas
-    - name: "Code of conduct"
-      target: community/coc.html
-    - name: "Ecosystem"
-      target: community/ecosystem.html
-    - name: "Benchmarks"
-      target: community/benchmarks.html
+      - name: "Blog"
+        target: community/blog/
+      - name: "Ask a question (StackOverflow)"
+        target: https://stackoverflow.com/questions/tagged/pandas
+      - name: "Code of conduct"
+        target: community/coc.html
+      - name: "Ecosystem"
+        target: community/ecosystem.html
+      - name: "Benchmarks"
+        target: community/benchmarks.html
   - name: "Contribute"
     target: contribute.html
 blog:
@@ -63,143 +63,147 @@ blog:
   author: "pandas team"
   feed_name: "pandas blog"
   feed:
-  - https://wesmckinney.com/feeds/pandas.atom.xml
-  - https://tomaugspurger.github.io/feed
-  - https://jorisvandenbossche.github.io/feeds/pandas.atom.xml
-  - https://datapythonista.me/blog/feeds/pandas.atom.xml
-  - https://numfocus.org/tag/pandas/feed/
-  - https://phofl.github.io/feeds/pandas.atom.xml
+    - https://wesmckinney.com/feeds/pandas.atom.xml
+    - https://tomaugspurger.github.io/feed
+    - https://jorisvandenbossche.github.io/feeds/pandas.atom.xml
+    - https://datapythonista.me/blog/feeds/pandas.atom.xml
+    - https://numfocus.org/tag/pandas/feed/
+    - https://phofl.github.io/feeds/pandas.atom.xml
 maintainers:
   active:
-  - jorisvandenbossche
-  - TomAugspurger
-  - jreback
-  - WillAyd
-  - mroeschke
-  - jbrockmendel
-  - datapythonista
-  - simonjayhawkins
-  - topper-123
-  - alimcmaster1
-  - Dr-Irv
-  - rhshadrach
-  - phofl
-  - attack68
-  - fangchenli
+    - jorisvandenbossche
+    - TomAugspurger
+    - jreback
+    - WillAyd
+    - mroeschke
+    - jbrockmendel
+    - datapythonista
+    - simonjayhawkins
+    - topper-123
+    - alimcmaster1
+    - Dr-Irv
+    - rhshadrach
+    - phofl
+    - attack68
+    - fangchenli
   inactive:
-  - lodagro
-  - jseabold
-  - jtratner
-  - shoyer
-  - chris-b1
-  - sinhrks
-  - cpcloud
-  - toobaz
-  - jschendel
-  - charlesdong1991
-  - dsaxton
-  - wesm
-  - gfyoung
-  - mzeitlin11
-  - twoertwein
-  - MarcoGorelli
-  - bashtage
-  - noatamir
-  - lithomas1
-  - lukemanley
+    - lodagro
+    - jseabold
+    - jtratner
+    - shoyer
+    - chris-b1
+    - sinhrks
+    - cpcloud
+    - toobaz
+    - jschendel
+    - charlesdong1991
+    - dsaxton
+    - wesm
+    - gfyoung
+    - mzeitlin11
+    - twoertwein
+    - MarcoGorelli
+    - bashtage
+    - noatamir
+    - lithomas1
+    - lukemanley
+  pandasstubs:
+    - Dr-Irv
+    - loicdiridollou
+    - cmp0xff
 workgroups:
   coc:
     name: Code of Conduct
     contact: coc@pandas.pydata.org
     responsibilities: "Make sure pandas is the welcoming and inclusive community we want it to be. Keeping the CoC updated, and addressing violation reports."
     members:
-    - Tom Augspurger
-    - Bijay Regmi
-    - Wuraola Oyewusi
-    - Мария Чакчурина
+      - Tom Augspurger
+      - Bijay Regmi
+      - Wuraola Oyewusi
+      - Мария Чакчурина
   finance:
     name: Finance
     contact: finance@pandas.pydata.org
     responsibilities: "Manage the funding. Coordinate the request of grants. Approve the project expenses."
     members:
-    - Matthew Roeschke
-    - Jeff Reback
-    - Joris Van den Bossche
-    - Patrick Hoefler
+      - Matthew Roeschke
+      - Jeff Reback
+      - Joris Van den Bossche
+      - Patrick Hoefler
   infrastructure:
     name: Infrastructure
     contact: infrastructure@pandas.pydata.org
     responsibilities: "Keep the pandas infrastructure up and working. In particular the servers for the website, benchmarks, CI and others needed."
     members:
-    - William Ayd
-    - Thomas Li
+      - William Ayd
+      - Thomas Li
   communications:
     name: Communications
     contact: communications@pandas.pydata.org
     responsibilities: "Share relevant information with the broader community, mainly via our social networks, as well as being the main point of contact between NumFOCUS and the core team."
     members:
-    - datapythonista
+      - datapythonista
 sponsors:
   active:
-  - name: "NumFOCUS"
-    url: https://numfocus.org/
-    logo: static/img/partners/numfocus.svg
-    kind: numfocus
-  - name: "Nvidia"
-    url: https://www.nvidia.com
-    logo: static/img/partners/nvidia.svg
-    kind: partner
-    description: "Matthew Roeschke"
-  - name: "Tidelift"
-    url: https://tidelift.com
-    logo: static/img/partners/tidelift.svg
-    kind: regular
-    description: "<i>pandas</i> is part of the <a href=\"https://tidelift.com/subscription/pkg/pypi-pandas?utm_source=pypi-pandas&utm_medium=referral&utm_campaign=readme\">Tidelift subscription</a>. You can support pandas by becoming a Tidelift subscriber."
-  - name: "Bodo"
-    url: https://www.bodo.ai/
-    logo: static/img/partners/bodo.svg
-    kind: regular
-    description: "Bodo's parallel computing platform uses pandas API, and Bodo financially supports pandas development to help improve pandas, in particular the pandas API"
-  inkind:  # not included in active so they don't appear in the home page
-  - name: "OVH"
-    url: https://us.ovhcloud.com/
-    description: "Website and documentation hosting."
-  - name: "Indeed"
-    url: https://opensource.indeedeng.io/
-    description: "<i>pandas</i> logo design"
+    - name: "NumFOCUS"
+      url: https://numfocus.org/
+      logo: static/img/partners/numfocus.svg
+      kind: numfocus
+    - name: "Nvidia"
+      url: https://www.nvidia.com
+      logo: static/img/partners/nvidia.svg
+      kind: partner
+      description: "Matthew Roeschke"
+    - name: "Tidelift"
+      url: https://tidelift.com
+      logo: static/img/partners/tidelift.svg
+      kind: regular
+      description: '<i>pandas</i> is part of the <a href="https://tidelift.com/subscription/pkg/pypi-pandas?utm_source=pypi-pandas&utm_medium=referral&utm_campaign=readme">Tidelift subscription</a>. You can support pandas by becoming a Tidelift subscriber.'
+    - name: "Bodo"
+      url: https://www.bodo.ai/
+      logo: static/img/partners/bodo.svg
+      kind: regular
+      description: "Bodo's parallel computing platform uses pandas API, and Bodo financially supports pandas development to help improve pandas, in particular the pandas API"
+  inkind: # not included in active so they don't appear in the home page
+    - name: "OVH"
+      url: https://us.ovhcloud.com/
+      description: "Website and documentation hosting."
+    - name: "Indeed"
+      url: https://opensource.indeedeng.io/
+      description: "<i>pandas</i> logo design"
   past:
-  - name: "Paris-Saclay Center for Data Science"
-    url: https://www.datascience-paris-saclay.fr/
-    kind: partner
-  - name: "Anaconda"
-    url: https://www.anaconda.com/
-    kind: partner
-  - name: "RStudio"
-    url: https://www.rstudio.com/
-    kind: partner
-  - name: "Ursa Labs"
-    url: https://ursalabs.org/
-    kind: partner
-  - name: "Gousto"
-    url: https://www.gousto.co.uk/
-    kind: partner
-  - name: "d-fine GmbH"
-    url: https://www.d-fine.com/en/
-    kind: partner
-  - name: "Two Sigma"
-    url: https://www.twosigma.com/
-    kind: partner
-  - name: "Voltron Data"
-    url: https://voltrondata.com/
-    kind: partner
-  - name: "Intel"
-    url: https://www.intel.com/
-    kind: partner
-  - name: "Chan Zuckerberg Initiative"
-    url: https://chanzuckerberg.com/
-    kind: regular
-  - name: "Coiled"
-    url: https://www.coiled.io
-    kind: partner
+    - name: "Paris-Saclay Center for Data Science"
+      url: https://www.datascience-paris-saclay.fr/
+      kind: partner
+    - name: "Anaconda"
+      url: https://www.anaconda.com/
+      kind: partner
+    - name: "RStudio"
+      url: https://www.rstudio.com/
+      kind: partner
+    - name: "Ursa Labs"
+      url: https://ursalabs.org/
+      kind: partner
+    - name: "Gousto"
+      url: https://www.gousto.co.uk/
+      kind: partner
+    - name: "d-fine GmbH"
+      url: https://www.d-fine.com/en/
+      kind: partner
+    - name: "Two Sigma"
+      url: https://www.twosigma.com/
+      kind: partner
+    - name: "Voltron Data"
+      url: https://voltrondata.com/
+      kind: partner
+    - name: "Intel"
+      url: https://www.intel.com/
+      kind: partner
+    - name: "Chan Zuckerberg Initiative"
+      url: https://chanzuckerberg.com/
+      kind: regular
+    - name: "Coiled"
+      url: https://www.coiled.io
+      kind: partner
 roadmap:
   pdeps_path: pdeps
diff --git a/web/pandas_web.py b/web/pandas_web.py
index dec03d00574f1..5006674096bf8 100755
--- a/web/pandas_web.py
+++ b/web/pandas_web.py
@@ -171,7 +171,9 @@ def maintainers_add_info(context):
 
         maintainers_info = {}
         for user in (
-            context["maintainers"]["active"] + context["maintainers"]["inactive"]
+            context["maintainers"]["active"]
+            + context["maintainers"]["inactive"]
+            + context["maintainers"]["pandasstubs"]
         ):
             resp = requests.get(
                 f"https://api.github.com/users/{user}",