diff --git a/docs/index.rst b/docs/index.rst
index 0f49b130be..978263fe91 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -357,6 +357,7 @@ user.
    api.rst
    template.rst
    testing.rst
+   team.rst
 
 The following Astroquery modules are mostly meant for internal use of
 services in Astroquery, you can use them for your scripts, but we don't guarantee API stability.
diff --git a/docs/team.rst b/docs/team.rst
new file mode 100644
index 0000000000..90427a6a88
--- /dev/null
+++ b/docs/team.rst
@@ -0,0 +1,116 @@
+Astroquery Team: List of Module Maintainers
+===========================================
+
+Astroquery is primarily maintained by Adam Ginsburg and Brigitta Sipőcz.
+
+Individual modules are partially maintained by their primary contributors
+or others who have taken over the responsibility:
+
+
++---------------+-----------------------+
+|               |                       |
+| Module        | Maintainer            |
++---------------+-----------------------+
+| ALMA          | @keflavich, @andamian |
++---------------+-----------------------+
+| atomic        |                       |
++---------------+-----------------------+
+| besancon      | @keflavich            |
++---------------+-----------------------+
+| CADC          | @andamian             |
++---------------+-----------------------+
+| CASDA         | @jd-au                |
++---------------+-----------------------+
+| CDS           | @bmatthieu3           |
++---------------+-----------------------+
+| DACE          | @julienb54            |
++---------------+-----------------------+
+| ESASKY        | @imbasimba            |
++---------------+-----------------------+
+| ESO           |                       |
++---------------+-----------------------+
+| gaia          | @jcsegovia            |
++---------------+-----------------------+
+| gama          |                       |
++---------------+-----------------------+
+| heasarc       |                       |
++---------------+-----------------------+
+| hitran        |                       |
++---------------+-----------------------+
+| ibe           |                       |
++---------------+-----------------------+
+| irsa          |                       |
++---------------+-----------------------+
+| irsa_dust     |                       |
++---------------+-----------------------+
+| jplspec       | @mommeri              |
++---------------+-----------------------+
+| magpis        | @keflavich            |
++---------------+-----------------------+
+| mast          | @ceb8                 |
++---------------+-----------------------+
+| mpc           | @mkelley              |
++---------------+-----------------------+
+| nasa_ads      | @kelockhart           |
++---------------+-----------------------+
+| ned           |                       |
++---------------+-----------------------+
+| nist          |                       |
++---------------+-----------------------+
+| nrao          | @keflavich            |
++---------------+-----------------------+
+| nvas          | @keflavich            |
++---------------+-----------------------+
+| simbad        |                       |
++---------------+-----------------------+
+| skyview       |                       |
++---------------+-----------------------+
+| splatalogue   |                       |
++---------------+-----------------------+
+| ukidss        | @keflavich            |
++---------------+-----------------------+
+| vamdc         |                       |
++---------------+-----------------------+
+| vizier        |                       |
++---------------+-----------------------+
+| vo_conesearch | @pllim                |
++---------------+-----------------------+
+| vsa           | @keflavich            |
++---------------+-----------------------+
+| xmatch        | @bmatthieu3           |
++---------------+-----------------------+
+
+
+Modules with a different API:
+
+
++--------------------------+------------+
+|                          |            |
+| Module                   | Maintainer |
++--------------------------+------------+
+| alfalfa                  |            |
++--------------------------+------------+
+| cosmosim                 |            |
++--------------------------+------------+
+| exoplanet_orbit_database |            |
++--------------------------+------------+
+| fermi                    | @cdeil     |
++--------------------------+------------+
+| jplhorizons              | @mommeri   |
++--------------------------+------------+
+| jplsbdb                  | @mommeri   |
++--------------------------+------------+
+| lamda                    | @keflavich |
++--------------------------+------------+
+| nasa_exoplanet_archive   |            |
++--------------------------+------------+
+| oac                      |            |
++--------------------------+------------+
+| ogle                     |            |
++--------------------------+------------+
+| open_exoplanet_catalogue |            |
++--------------------------+------------+
+| sdss                     |            |
++--------------------------+------------+
+| sha                      |            |
++--------------------------+------------+