@@ -1553,7 +1553,7 @@
       ],
       "functions": {
         "git_status_byindex": {
-          "ignore": true
+          "isAsync": false
         },
         "git_status_foreach": {
           "isAsync": true,
 
@@ -187,6 +187,25 @@
           ]
         }
       ],
+      [
+        "git_status_entry",
+        {
+          "fields": [
+            {
+              "type": "git_status_t",
+              "name": "status"
+            },
+            {
+              "type": "git_diff_delta *",
+              "name": "head_to_index"
+            },
+            {
+              "type": "git_diff_delta *",
+              "name": "index_to_workdir"
+            }
+          ]
+        }
+      ],
       [
         "git_diff_perfdata",
         {
 
@@ -0,0 +1,13 @@
+var NodeGit = require("../");
+var normalizeOptions = require("./util/normalize_options");
+
+var StatusList = NodeGit.StatusList;
+
+// Override StatusList.create to normalize opts
+var create = StatusList.create;
+StatusList.create = function(repo, opts) {
+  opts = normalizeOptions(opts, NodeGit.StatusOptions);
+  return create(repo, opts);
+};
+
+module.exports = StatusList;
@@ -0,0 +1,60 @@
+var assert = require("assert");
+var path = require("path");
+var promisify = require("promisify-node");
+var Promise = require("nodegit-promise");
+var fse = promisify(require("fs-extra"));
+var local = path.join.bind(path, __dirname);
+var exec = promisify(function(command, opts, callback) {
+  return require("child_process").exec(command, opts, callback);
+});
+
+describe.only("StatusList", function() {
+  var Status = require(local("../../lib/status"));
+  var StatusList = require(local("../../lib/status_list"));
+  var Repository = require(local("../../lib/repository"));
+
+  var reposPath = local("../repos/workdir/.git");
+
+  before(function() {
+    var test = this;
+    return Repository.open(reposPath)
+      .then(function(repository) {
+        test.repository = repository;
+      });
+  });
+
+  it("gets status with deltas", function() {
+    var fileName = "my-new-file-that-shouldnt-exist.file";
+    var fileContent = "new file from status tests";
+    var repo = this.repository;
+    var filePath = path.join(repo.workdir(), fileName);
+    return exec("git clean -xdf", {cwd: local("../repos/workdir")})
+      .then(function() {
+        return fse.writeFile(filePath, fileContent);
+      })
+      .then(function() {
+        var opts = {
+          flags: Status.OPT.INCLUDE_UNTRACKED +
+                 Status.OPT.RECURSE_UNTRACKED_DIRS
+        };
+
+        var list = StatusList.create(repo, opts);
+        assert.equal(list.entrycount(), 1);
+
+        for (var i = 0; i < list.entrycount(); i++) {
+          var entry = Status.byIndex(list, i);
+          assert.equal(entry.indexToWorkdir().newFile().path(), fileName);
+        }
+      })
+      .then(function() {
+        return fse.remove(filePath);
+      })
+      .catch(function(e) {
+        return fse.remove(filePath)
+          .then(function() {
+            return Promise.reject(e);
+          });
+
+      });
+  });
+});