diff --git a/README.md b/README.md
index 5631105..1ceba91 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,7 @@ What kind of metadata can you convey using badges?
 ## Services using the Shields standard
 * [Badger](https://github.com/badges/badgerbadgerbadger)
 * [badges2svg](https://github.com/bfontaine/badges2svg)
+* [Codacy](https://www.codacy.com)
 * [Code Climate](https://codeclimate.com/changelog/510d4fde56b102523a0004bf)
 * [Coveralls](https://coveralls.io/)
 * [Forkability](http://basicallydan.github.io/forkability/)
diff --git a/server.js b/server.js
index 43d2358..51de399 100644
--- a/server.js
+++ b/server.js
@@ -2495,7 +2495,7 @@ cache(function(data, match, sendBadge, request) {
 }));
 
 // Codacy integration
-camp.route(/^\/codacy\/([^\/]+)(?:\/(.+))?\.(svg|png|gif|jpg|json)$/,
+camp.route(/^\/codacy\/(?:grade\/)?(?!coverage\/)([^\/]+)(?:\/(.+))?\.(svg|png|gif|jpg|json)$/,
 cache(function(data, match, sendBadge, request) {
   var projectId = match[1];  // eg. e27821fb6289410b8f58338c7e0bc686
   var branch = match[2];
@@ -2506,7 +2506,7 @@ cache(function(data, match, sendBadge, request) {
     queryParams.branch = branch;
   }
   var query = querystring.stringify(queryParams);
-  var url = 'https://www.codacy.com/project/badge/' + projectId + '?' + query;
+  var url = 'https://www.codacy.com/project/badge/grade/' + projectId + '?' + query;
   var badgeData = getBadgeData('code quality', data);
   fetchFromSvg(request, url, function(err, res) {
     if (err != null) {
@@ -2543,6 +2543,37 @@ cache(function(data, match, sendBadge, request) {
   });
 }));
 
+camp.route(/^\/codacy\/coverage\/(?!grade\/)([^\/]+)(?:\/(.+))?\.(svg|png|gif|jpg|json)$/,
+cache(function(data, match, sendBadge, request) {
+  var projectId = match[1];  // eg. e27821fb6289410b8f58338c7e0bc686
+  var branch = match[2];
+  var format = match[3];
+
+  queryParams = {};
+  if (branch) {
+    queryParams.branch = branch;
+  }
+  var query = querystring.stringify(queryParams);
+  var url = 'https://www.codacy.com/project/badge/coverage/' + projectId + '?' + query;
+  var badgeData = getBadgeData('coverage', data);
+  fetchFromSvg(request, url, function(err, res) {
+    if (err != null) {
+      badgeData.text[1] = 'inaccessible';
+      sendBadge(format, badgeData);
+      return;
+    }
+    try {
+      badgeData.text[1] = res;
+      badgeData.colorscheme = coveragePercentageColor(parseInt(res));
+      sendBadge(format, badgeData);
+
+    } catch(e) {
+      badgeData.text[1] = 'invalid';
+      sendBadge(format, badgeData);
+    }
+  });
+}));
+
 // Hackage version integration.
 camp.route(/^\/hackage\/v\/(.*)\.(svg|png|gif|jpg|json)$/,
 cache(function(data, match, sendBadge, request) {
diff --git a/try.html b/try.html
index 3f079ee..682debf 100644
--- a/try.html
+++ b/try.html
@@ -706,13 +706,21 @@ Pixel-perfect   Retina-ready   Fast   Consistent   Hackable
     <td><img src='/wordpress/plugin/r/akismet.svg' alt=''/></td>
     <td><code>https://img.shields.io/wordpress/plugin/r/akismet.svg</code></td>
   </tr>
-  <tr><th> Codacy: </th>
-    <td><img src='/codacy/e27821fb6289410b8f58338c7e0bc686.svg' alt=''/></td>
-    <td><code>https://img.shields.io/codacy/e27821fb6289410b8f58338c7e0bc686.svg</code></td>
+  <tr><th> Codacy grade: </th>
+    <td><img src='https://img.shields.io/codacy/grade/e27821fb6289410b8f58338c7e0bc686.svg' alt=''/></td>
+    <td><code>https://img.shields.io/codacy/grade/e27821fb6289410b8f58338c7e0bc686.svg</code></td>
   </tr>
-  <tr><th> Codacy branch: </th>
-    <td><img src='/codacy/e27821fb6289410b8f58338c7e0bc686/master.svg' alt=''/></td>
-    <td><code>https://img.shields.io/codacy/e27821fb6289410b8f58338c7e0bc686/master.svg</code></td>
+  <tr><th> Codacy branch grade: </th>
+    <td><img src='https://img.shields.io/codacy/grade/e27821fb6289410b8f58338c7e0bc686/master.svg' alt=''/></td>
+    <td><code>https://img.shields.io/codacy/grade/e27821fb6289410b8f58338c7e0bc686/master.svg</code></td>
+  </tr>
+  <tr><th> Codacy coverage: </th>
+    <td><img src='https://img.shields.io/codacy/coverage/c44df2d9c89a4809896914fd1a40bedd.svg' alt=''/></td>
+    <td><code>https://img.shields.io/codacy/coverage/c44df2d9c89a4809896914fd1a40bedd.svg</code></td>
+  </tr>
+  <tr><th> Codacy branch coverage: </th>
+    <td><img src='https://img.shields.io/codacy/coverage/c44df2d9c89a4809896914fd1a40bedd/master.svg' alt=''/></td>
+    <td><code>https://img.shields.io/codacy/coverage/c44df2d9c89a4809896914fd1a40bedd/master.svg</code></td>
   </tr>
   <tr><th> Libscore: </th>
     <td><img src='/libscore/s/jQuery.svg' alt=''/></td>