diff --git a/.gitignore b/.gitignore
index 284e3e95f54b..b864c95e2ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,10 @@ packages/
 /generated-files
 nbactions.xml
 
+# website
+website/build/
+website/package-lock.json
+
 # scalatra
 samples/server-generator/scalatra/output
 samples/server-generator/scalatra/target
diff --git a/website/dynamic/sponsors.yml b/website/dynamic/sponsors.yml
new file mode 100644
index 000000000000..f4fcea96426e
--- /dev/null
+++ b/website/dynamic/sponsors.yml
@@ -0,0 +1,5 @@
+-
+  caption: "NamSor"
+  image: "img/companies/namsor.png"
+  infoLink: "https://www.namsor.com/?utm_source=openapi_generator&utm_medium=official_website&utm_campaign=sponsor"
+  bronze: true
diff --git a/website/dynamic/users.yml b/website/dynamic/users.yml
index 53865c21bf13..6860ecadea33 100644
--- a/website/dynamic/users.yml
+++ b/website/dynamic/users.yml
@@ -28,6 +28,11 @@
   image: "img/companies/pepabo.png"
   infoLink: "https://pepabo.com/en/"
   pinned: false
+-
+  caption: "GoDaddy"
+  image: "img/companies/godaddy.png"
+  infoLink: "https://www.godaddy.com/"
+  pinned: false
 -
   caption: JustStar
   image: "img/companies/juststar.png"
@@ -43,6 +48,11 @@
   image: "img/companies/metaswitch.svg"
   infoLink: "https://www.metaswitch.com/"
   pinned: true
+-
+  caption: NamSor
+  image: "img/companies/namsor.png"
+  infoLink: "https://www.namsor.com/?utm_source=openapi_generator&utm_medium=official_website&utm_campaign=sponsor"
+  pinned: false
 -
   caption: Myworkout
   image: "img/companies/myworkout.png"
@@ -88,6 +98,11 @@
   image: "img/companies/unblu.svg"
   infoLink: "https://www.unblu.com/"
   pinned: true
+-
+  caption: Xero
+  image: "img/companies/xero.png"
+  infoLink: "https://www.xero.com/"
+  pinned: false
 -
   caption: Zalando
   image: "img/companies/zalando.jpg"
diff --git a/website/i18n/en.json b/website/i18n/en.json
index 1b5c2b0efb30..096838689ddb 100644
--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@@ -94,6 +94,9 @@
       "generators/csharp-nancyfx": {
         "title": "generators/csharp-nancyfx"
       },
+      "generators/csharp-netcore": {
+        "title": "generators/csharp-netcore"
+      },
       "generators/csharp-refactor": {
         "title": "generators/csharp-refactor"
       },
@@ -202,6 +205,9 @@
       "generators/jaxrs-cxf-client": {
         "title": "generators/jaxrs-cxf-client"
       },
+      "generators/jaxrs-cxf-extended": {
+        "title": "generators/jaxrs-cxf-extended"
+      },
       "generators/jaxrs-cxf": {
         "title": "generators/jaxrs-cxf"
       },
@@ -277,6 +283,9 @@
       "generators/python-aiohttp": {
         "title": "generators/python-aiohttp"
       },
+      "generators/python-blueplanet": {
+        "title": "generators/python-blueplanet"
+      },
       "generators/python-flask": {
         "title": "generators/python-flask"
       },
@@ -313,12 +322,21 @@
       "generators/scala-gatling": {
         "title": "generators/scala-gatling"
       },
+      "generators/scala-httpclient-deprecated": {
+        "title": "generators/scala-httpclient-deprecated"
+      },
       "generators/scala-httpclient": {
         "title": "generators/scala-httpclient"
       },
       "generators/scala-lagom-server": {
         "title": "generators/scala-lagom-server"
       },
+      "generators/scala-play-framework": {
+        "title": "generators/scala-play-framework"
+      },
+      "generators/scala-play-server": {
+        "title": "generators/scala-play-server"
+      },
       "generators/scalatra": {
         "title": "generators/scalatra"
       },
diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index 79dd3dea165d..be650cef99c4 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -323,10 +323,36 @@ class Index extends React.Component {
       );
     };
 
+    const Sponsors = () => {
+      if ((siteConfig.sponsors || []).length === 0) {
+        return null;
+      }
+
+      const bronze_sponsors = siteConfig.sponsors
+        .filter(user => user.bronze)
+        .map(user => (
+          <a href={user.infoLink} key={user.infoLink}>
+            <img src={baseUrl + user.image} alt={user.caption} title={user.caption} />
+          </a>
+        ));
+
+      const pageUrl = page => baseUrl + (language ? `${language}/` : '') + page;
+
+      return (
+        <div className="productSponsorSection paddingBottom">
+          <h2><b>Sponsors</b></h2>
+          <p>If you find OpenAPI Generator useful for work, please consider asking your company to support this Open Source project by <a href="https://opencollective.com/openapi_generator">becoming a sponsor</a>. You can also individually sponsor the project by <a href="https://opencollective.com/openapi_generator">becoming a backer</a>.</p>
+          <h3>Thank you to our bronze sponsors!</h3>
+          <div className="logos">{bronze_sponsors}</div>
+        </div>
+      );
+    };
+
     return (
       <div>
         <HomeSplash siteConfig={siteConfig} language={language} />
         <div className="mainContainer">
+          <Sponsors />
           <Features />
           {/*<FeatureCallout />*/}
           <LearnHow />
diff --git a/website/siteConfig.js b/website/siteConfig.js
index 490fb49bb7a5..98a32f37d91c 100755
--- a/website/siteConfig.js
+++ b/website/siteConfig.js
@@ -9,6 +9,7 @@ const loadYaml = relativePath => parseYaml(fs.readFileSync(path.join(__dirname,
 
 const team = loadYaml("dynamic/team.yml");
 const users = loadYaml("dynamic/users.yml");
+const sponsors = loadYaml("dynamic/sponsors.yml");
 const baseUrl = '/';
 const siteConfig = {
   title: 'OpenAPI Generator', // Title for your website.
@@ -105,6 +106,8 @@ const siteConfig = {
   repoUrl: 'https://github.com/OpenAPITools/openapi-generator',
 
   team: team,
+
+  sponsors: sponsors,
 };
 
 module.exports = siteConfig;
diff --git a/website/static/img/companies/godaddy.png b/website/static/img/companies/godaddy.png
new file mode 100644
index 000000000000..6dd77c34731d
Binary files /dev/null and b/website/static/img/companies/godaddy.png differ
diff --git a/website/static/img/companies/namsor.png b/website/static/img/companies/namsor.png
new file mode 100644
index 000000000000..37458e2f6962
Binary files /dev/null and b/website/static/img/companies/namsor.png differ
diff --git a/website/static/img/companies/xero.png b/website/static/img/companies/xero.png
new file mode 100644
index 000000000000..54a4f6956966
Binary files /dev/null and b/website/static/img/companies/xero.png differ