diff --git a/server.js b/server.js
index 1cc01cd0ed5c0..54a76091e5231 100644
--- a/server.js
+++ b/server.js
@@ -315,9 +315,9 @@ cache(function(data, match, sendBadge, request) {
 // Shippable integration
 camp.route(/^\/shippable?\/([^\/]+)(?:\/(.+))?\.(svg|png|gif|jpg|json)$/,
 cache(function(data, match, sendBadge, request) {
-  var project = match[2];  // eg, 54d119db5ab6cc13528ab183
-  var branch = match[3];
-  var format = match[4];
+  var project = match[1];  // eg, 54d119db5ab6cc13528ab183
+  var branch = match[2];
+  var format = match[3];
   var url = 'https://api.shippable.com/projects/' + project + '/badge';
   if (branch != null) {
     url += '?branchName=' + branch;
diff --git a/try.html b/try.html
index e32b49d33022d..cba121ca5555f 100644
--- a/try.html
+++ b/try.html
@@ -112,6 +112,14 @@ <h3 id="build"> Build </h3>
       <td><img src='/circleci/project/BrightFlair/PHP.Gt/master.svg' alt=''/></td>
       <td><code>https://img.shields.io/circleci/project/BrightFlair/PHP.Gt/master.svg</code></td>
   </tr>
+  <tr><th> Shippable: </th>
+      <td><img src='/shippable/54d119db5ab6cc13528ab183.svg' alt=''/></td>
+      <td><code>https://img.shields.io/shippable/54d119db5ab6cc13528ab183.svg</code></td>
+  </tr>
+  <tr><th> Shippable branch: </th>
+      <td><img src='/shippable/54d119db5ab6cc13528ab183/master.svg' alt=''/></td>
+      <td><code>https://img.shields.io/shippable/54d119db5ab6cc13528ab183/master.svg</code></td>
+  </tr>
   <tr><th> Jenkins: </th>
     <td><img src='/jenkins/s/https/jenkins.qa.ubuntu.com/precise-desktop-amd64_default.svg' alt=''/></td>
     <td><code>https://img.shields.io/jenkins/s/https/jenkins.qa.ubuntu.com/precise-desktop-amd64_default.svg</code></td>