diff --git a/api/v2.6/authors.json b/api/v2.6/authors.json
index 363022f05eae..9805889c138f 100644
--- a/api/v2.6/authors.json
+++ b/api/v2.6/authors.json
@@ -30,6 +30,13 @@ layout: null
                 {% endfor %}
             ]
             {% endif %}
+            {% if author.teams %}
+            , "teams": [
+                {% for team in author.teams %}
+                    "{{team}}"{% unless forloop.last %},{% endunless %}
+                {% endfor %}
+            ]
+            {% endif %}
             {% if author.previously %}
             , "previously": [
                 {% for previous in author.previously %}
diff --git a/api/v2.6/teams.json b/api/v2.6/teams.json
new file mode 100644
index 000000000000..fa5d5c330a47
--- /dev/null
+++ b/api/v2.6/teams.json
@@ -0,0 +1,19 @@
+---
+layout: null
+---
+
+{ "links":
+    { "self": "{{ site.url }}/teams" }
+, "data":
+    [
+    {% for team in site.teams %}
+        { "id"        : "{{ team.id | remove: '/team/' }}"
+        , "type"      : "team"
+        , "name" : "{{ team.name }}"
+        , "mission" : "{{ team.mission | strip_newlines }}"
+        , "incubator" : "{{ team.incubator }}"
+        }
+        {% unless forloop.last %},{% endunless %}
+    {% endfor %}
+    ]
+}