diff --git a/README.md b/README.md
index 20a863f8dd8..8ac9fbe4d5c 100644
--- a/README.md
+++ b/README.md
@@ -198,14 +198,66 @@ These folks keep the project moving and are resources for help.
 The people who manage releases, review feature requests, and meet regularly to ensure ESLint is properly maintained.
 
 <!-- NOTE: This section is autogenerated. Do not manually edit.-->
-<!--
+<!--tscstart-->
+<table><tbody><tr><td align="center" valign="top" width="11%">
+<a href="https://github.com/nzakas">
+<img src="https://github.com/nzakas.png?s=75" width="75" height="75"><br />
+Nicholas C. Zakas
+</a>
+</td><td align="center" valign="top" width="11%">
+<a href="https://github.com/platinumazure">
+<img src="https://github.com/platinumazure.png?s=75" width="75" height="75"><br />
+Kevin Partington
+</a>
+</td><td align="center" valign="top" width="11%">
+<a href="https://github.com/ilyavolodin">
+<img src="https://github.com/ilyavolodin.png?s=75" width="75" height="75"><br />
+Ilya Volodin
+</a>
+</td><td align="center" valign="top" width="11%">
+<a href="https://github.com/btmills">
+<img src="https://github.com/btmills.png?s=75" width="75" height="75"><br />
+Brandon Mills
+</a>
+</td><td align="center" valign="top" width="11%">
+<a href="https://github.com/mysticatea">
+<img src="https://github.com/mysticatea.png?s=75" width="75" height="75"><br />
+Toru Nagashima
+</a>
+</td><td align="center" valign="top" width="11%">
+<a href="https://github.com/gyandeeps">
+<img src="https://github.com/gyandeeps.png?s=75" width="75" height="75"><br />
+Gyandeep Singh
+</a>
+</td><td align="center" valign="top" width="11%">
+<a href="https://github.com/kaicataldo">
+<img src="https://github.com/kaicataldo.png?s=75" width="75" height="75"><br />
+Kai Cataldo
+</a>
+</td><td align="center" valign="top" width="11%">
+<a href="https://github.com/not-an-aardvark">
+<img src="https://github.com/not-an-aardvark.png?s=75" width="75" height="75"><br />
+Teddy Katz
+</a>
+</td></tr></tbody></table><!--tscend-->
 
 ### Committers
 
 The people who review and fix bugs and help triage issues.
 
 <!-- NOTE: This section is autogenerated. Do not manually edit.-->
-<!--
+<!--committersstart-->
+<table><tbody><tr><td align="center" valign="top" width="11%">
+<a href="https://github.com/aladdin-add">
+<img src="https://github.com/aladdin-add.png?s=75" width="75" height="75"><br />
+薛定谔的猫
+</a>
+</td><td align="center" valign="top" width="11%">
+<a href="https://github.com/g-plane">
+<img src="https://github.com/g-plane.png?s=75" width="75" height="75"><br />
+Pig Fang
+</a>
+</td></tr></tbody></table><!--committersend-->
 
 ## Sponsors
 
@@ -213,6 +265,11 @@ The following companies, organizations, and individuals support ESLint's ongoing
 
 <!-- NOTE: This section is autogenerated. Do not manually edit.-->
 <!--sponsorsstart-->
+<h3>Gold Sponsors</h3>
+<p><a href="https://www.airbnb.com/"><img src="https://images.opencollective.com/proxy/images/?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2F098e3bd0-4d57-11e8-9324-0f6cc1f92bf1.png&height=96" alt="Airbnb" height="96"></a> <a href="https://code.facebook.com/projects/"><img src="https://images.opencollective.com/proxy/images/?src=https%3A%2F%2Fres.cloudinary.com%2Fopencollective%2Fimage%2Fupload%2Fv1508519428%2FS9gk78AS_400x400_fulq2l.jpg&height=96" alt="Facebook Open Source" height="96"></a> <a href="https://badoo.com/team?utm_source=eslint"><img src="https://images.opencollective.com/proxy/images/?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2Fbbdb9cc0-3b5d-11e9-9537-ad85092287b8.png&height=96" alt="Badoo" height="96"></a></p><h3>Silver Sponsors</h3>
+<p><a href="https://www.ampproject.org/"><img src="https://images.opencollective.com/proxy/images/?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2F68ed8b70-ebf2-11e6-9958-cb7e79408c56.png&height=96" alt="AMP Project" height="64"></a></p><h3>Bronze Sponsors</h3>
+<p><a href="http://faithlife.com/ref/about"><img src="https://images.opencollective.com/proxy/images/?src=https%3A%2F%2Flogo.clearbit.com%2Ffaithlife.com&height=96" alt="Faithlife" height="32"></a></p>
+<!--sponsorsend-->
 
 ## Technology Sponsors
 
diff --git a/package.json b/package.json
index ce8e7802bc4..5fea2853749 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,7 @@
     "brfs": "^2.0.0",
     "chai": "^4.0.1",
     "cheerio": "^0.22.0",
+    "common-tags": "^1.8.0",
     "coveralls": "^3.0.1",
     "dateformat": "^3.0.3",
     "ejs": "^2.6.1",
diff --git a/tools/update-readme.js b/tools/update-readme.js
index 42c5415c11c..da7ea03a194 100644
--- a/tools/update-readme.js
+++ b/tools/update-readme.js
@@ -15,7 +15,7 @@
 
 const path = require("path");
 const fs = require("fs");
-const { unIndent } = require("../tests/lib/rules/_utils");
+const { stripIndents } = require("common-tags");
 
 //-----------------------------------------------------------------------------
 // Data
@@ -50,7 +50,7 @@ delete allSponsors.backers;
  */
 function formatTeamMembers(members, label) {
     /* eslint-disable indent*/
-    return unIndent`<!--${label}start-->
+    return stripIndents`<!--${label}start-->
         <table><tbody><tr>${
         members.map((member, index) => `<td align="center" valign="top" width="11%">
             <a href="https://github.com/${member.username}">
@@ -71,7 +71,7 @@ function formatSponsors(sponsors) {
     const nonEmptySponsors = Object.keys(sponsors).filter(tier => sponsors[tier].length > 0);
 
     /* eslint-disable indent*/
-    return unIndent`<!--sponsorsstart-->
+    return stripIndents`<!--sponsorsstart-->
         ${
             nonEmptySponsors.map(tier => `<h3>${tier[0].toUpperCase()}${tier.slice(1)} Sponsors</h3>
             <p>${