diff --git a/_includes/authorlist.html b/_includes/authorlist.html
new file mode 100644
index 00000000..e32a48c4
--- /dev/null
+++ b/_includes/authorlist.html
@@ -0,0 +1,10 @@
+{%- assign authors=include.authors|split:"," -%}
+{%- for author in authors -%}
+  {%- if author contains "<" -%}
+    {%- assign authorparts=author|split:"<" -%}
+    <a href="mailto:{{authorparts[1]|remove:">"}}">{{authorparts[0]|strip}}</a>
+  {%- else -%}
+    {{author}}
+  {%- endif -%}
+  {% if forloop.last == false %}, {% endif %}
+{%- endfor -%}
diff --git a/_includes/eiptable.html b/_includes/eiptable.html
index 409ae05c..db2bcfa4 100644
--- a/_includes/eiptable.html
+++ b/_includes/eiptable.html
@@ -10,7 +10,7 @@
         <tr>
           <td><a href="{{page.url|relative_url}}">{{page.eip|xml_escape}}</a></td>
           <td>{{page.title|xml_escape}}</td>
-          <td>{{page.author|xml_escape}}</td>
+          <td>{% include authorlist.html authors=page.author %}</td>
         </tr>
       {% endfor %}
     </table>
diff --git a/_layouts/eip.html b/_layouts/eip.html
index ba4cf005..f1a226e0 100644
--- a/_layouts/eip.html
+++ b/_layouts/eip.html
@@ -5,7 +5,7 @@ layout: default
 <div class="home">
   <h1 class="page-heading">EIP {{ page.eip | xml_escape }}: {{ page.title | xml_escape }}</h1>
   <table>
-    <tr><th>Author</th><td>{{ page.author | xml_escape }}</td></tr>
+    <tr><th>Author</th><td>{% include authorlist.html authors=page.author %}</td></tr>
     {% if page["discussions-to"] != undefined %}
       <tr><th>Discussions-To</th><td><a href="mailto:{{ page["discussions-to"] | uri_escape }}">{{ page["discussions-to"] | xml_escape }}</a></td></tr>
     {% endif %}
@@ -19,10 +19,10 @@ layout: default
       <tr><th>Requires</th><td>{% include eipnums.html eips=page.requires %}</td></tr>
     {% endif %}
     {% if page.replaces != undefined %}
-      <tr><th>Replaces</th><td>{{% include eipnums.html eips=page.replaces %}</td></tr>
+      <tr><th>Replaces</th><td>{% include eipnums.html eips=page.replaces %}</td></tr>
     {% endif %}
     {% if page["superseded-by"] != undefined %}
-      <tr><th>Superseded by</th><td>{% include eipnums.html eips=page['superseded-by'] %}</td></tr>
+      <tr><th>Superseded by</th><td>{% include eipnums.html eips=page.superseded-by %}</td></tr>
     {% endif %}
     {% if page.resolution != undefined %}
       <tr><th>Resolution</th><td><a href="{{page.resolution | uri_escape }}">{{ page.resolution | xml_escape }}</a></td></tr>