diff --git a/pkg/web/templates/branches.html b/pkg/web/templates/branches.html
index d67243085c114cc14968d5d5e24470218e7dc144..f9d2db2f25536c7a248fde4025f363320a3bffc9 100644
--- a/pkg/web/templates/branches.html
+++ b/pkg/web/templates/branches.html
@@ -25,7 +25,15 @@
     </details>
     {{end}}
      <p>
-       <strong>{{.Commit.Author.Name}}</strong> created
+       {{ $names := .Commit | attributionNames }}
+       {{ $nlen := len $names }}
+       {{ range $i, $n := $names }}
+         {{ if gt $i 0 }}
+           {{ if eq $nlen 2 }} and {{ else if eq $i (sub $nlen 1) }}, and {{ else }}, {{ end }}
+         {{ end }}
+         <strong>{{$n}}</strong>
+       {{ end }}
+       created
        <time datetime="{{.Commit.Author.When | rfc3339}}" data-tooltip="{{.Commit.Author.When | formatDate}}">{{.Commit.Author.When | relativeTime}}</time>
      </p>
     {{end}}
diff --git a/pkg/web/templates/tags.html b/pkg/web/templates/tags.html
index cd404160c8c3987be818eec396d5eed571495a96..b23163dacb506b7cabe530feda3363a2accbcdcd 100644
--- a/pkg/web/templates/tags.html
+++ b/pkg/web/templates/tags.html
@@ -10,7 +10,15 @@
     {{end}}
     {{if .Commit}}
      <p>
-       <strong>{{.Commit.Author.Name}}</strong> created
+       {{ $names := .Commit | attributionNames }}
+       {{ $nlen := len $names }}
+       {{ range $i, $n := $names }}
+         {{ if gt $i 0 }}
+           {{ if eq $nlen 2 }} and {{ else if eq $i (sub $nlen 1) }}, and {{ else }}, {{ end }}
+         {{ end }}
+         <strong>{{$n}}</strong>
+       {{ end }}
+       created
        <time datetime="{{.TagDate | rfc3339}}" data-tooltip="{{.TagDate | formatDate}}">{{.TagDate | relativeTime}}</time>
      </p>
     {{end}}