diff --git a/ci_info.js b/ci_info.js
index 56da1a7..adce065 100644
--- a/ci_info.js
+++ b/ci_info.js
@@ -60,6 +60,14 @@ module.exports = {
         commit_sha:       env.APPVEYOR_REPO_COMMIT,
         pull_request:     env.APPVEYOR_PULL_REQUEST_NUMBER,
       }
+    } else if (env.BUILDKITE) {
+      return {
+        name:             "buildkite",
+        build_identifier: env.BUILDKITE_BUILD_ID,
+        build_url:        env.BUILDKITE_BUILD_URL,
+        branch:           env.BUILDKITE_BRANCH,
+        commit_sha:       env.BUILDKITE_COMMIT
+      }
     } else {
       return {};
     }
diff --git a/test/test.js b/test/test.js
index 15f097c..6ec6d02 100644
--- a/test/test.js
+++ b/test/test.js
@@ -48,5 +48,12 @@ describe('ci_info', function() {
       assert.equal(ci.name, 'appveyor');
     });
 
+    it('should return buildkite as name if process.env.BUILDKITE is set', function() {
+      process.env.BUILDKITE = 'true';
+
+      var ci = CiInfo.getInfo();
+      assert.equal(ci.name, 'buildkite');
+    });
+
   });
 });
\ No newline at end of file