@@ -230,14 +230,26 @@
   "cred": {
     "cType": "git_cred",
     "functions": {
+      "git_cred_default_new":{
+        "isAsync": false
+      },
       "git_cred_ssh_custom_new": {
         "ignore": true
       },
       "git_cred_ssh_interactive_new": {
         "ignore": true
       },
+      "git_cred_ssh_key_from_agent":{
+        "isAsync": false
+      },
+      "git_cred_ssh_key_new":{
+        "isAsync": false
+      },
       "git_cred_userpass": {
         "ignore": true
+      },
+      "git_cred_userpass_plaintext_new": {
+        "isAsync": false
       }
     }
   },
@@ -332,6 +344,13 @@
       "git_diff_tree_to_index": {
         "ignore": true
       },
+      "git_diff_tree_to_tree": {
+        "args": {
+          "opts": {
+            "isOptional": true
+          }
+        }
+      },
       "git_diff_tree_to_workdir": {
         "ignore": true
       },
@@ -675,9 +694,15 @@
       "git_patch_from_buffers": {
         "ignore": true
       },
+      "git_patch_from_diff": {
+        "isAsync": false
+      },
       "git_patch_get_hunk": {
         "ignore": true
       },
+      "git_patch_get_line_in_hunk": {
+        "isAsync": false
+      },
       "git_patch_line_stats": {
         "ignore": true
       },
@@ -786,7 +811,11 @@
         "ignore": true
       },
       "git_remote_list": {
-        "ignore": true
+        "args": {
+          "out": {
+            "shouldAlloc": true
+          }
+        }
       },
       "git_remote_ls": {
         "ignore": true
@@ -839,11 +868,10 @@
       "git_revwalk_free": {
         "ignore": true
       },
-      "git_revwalk_next": {
-        "ignore": true
-      },
       "git_revwalk_new": {
-        "ignore": true
+        "isAsync": false,
+        "jsFunctionName": "createRevwalk",
+        "cppFunctionName": "CreateRevwalk"
       }
     }
   },
 
@@ -1,72 +1,159 @@
 {
-  "types": [
-    [
-      "git_direction",
-      {
-        "type": "enum"
-      }
-    ],
-    [
-      "git_merge_options",
-      {
-        "type": "struct",
-        "fields": [
-          {
-            "type": "unsigned int",
-            "name": "version"
-          },
-          {
-            "type": "git_merge_tree_flag_t",
-            "name": "flags"
-          },
-          {
-            "type": "unsigned int",
-            "name": "rename_threshold"
-          },
-          {
-            "type": "unsigned int",
-            "name": "target_limit"
-          },
-          {
-            "type": "git_diff_similarity_metric *",
-            "name": "metric",
-            "ignore": true
-          },
-          {
-            "type": "git_merge_file_favor_t",
-            "name": "file_favor"
+  "types": {
+    "git_cred_default": {
+      "decl": "git_cred"
+    },
+    "git_diff_hunk": {
+      "decl": [
+        "int old_start",
+        "int old_lines",
+        "int new_start",
+        "int new_lines",
+        "size_t header_len",
+        "char header[128]"
+      ]
+    },
+    "git_diff_line": {
+      "decl": [
+        "int origin",
+        "int old_lineno",
+        "int new_lineno",
+        "int num_lines",
+        "size_t, content_len",
+        "git_off_t content_offset",
+        "const char * content"
+      ],
+      "fields": [
+        {
+          "name": "origin",
+          "type": "int"
+        },
+        {
+          "name": "old_lineno",
+          "type": "int"
+        },
+        {
+          "name": "new_lineno",
+          "type": "int"
+        },
+        {
+          "name": "num_lines",
+          "type": "int"
+        },
+        {
+          "name": "content_len",
+          "type": "size_t"
+        },
+        {
+          "name": "content_offset",
+          "type": "git_off_t"
+        },
+        {
+          "name": "content",
+          "type": "const char *"
+        }
+      ]
+    },
+    "git_note_iterator": {
+      "decl": "git_iterator"
+    },
+    "git_tree_entry": {
+      "fields": [
+        {
+          "name": "removed",
+          "type": "uint16_t"
+        },
+        {
+          "name": "attr",
+          "type": "uint16_t"
+        },
+        {
+          "name": "oid",
+          "type": "git_oid"
+        },
+        {
+          "name": "filename_len",
+          "type": "size_t"
+        },
+        {
+          "name": "filename",
+          "structType": "char",
+          "structName": "filename[1]",
+          "type": "char *"
+        }
+      ]
+    }
+  },
+  "new" : {
+    "types": [
+      [
+        "git_direction",
+        {
+          "type": "enum"
+        }
+      ],
+      [
+        "git_merge_options",
+        {
+          "type": "struct",
+          "fields": [
+            {
+              "type": "unsigned int",
+              "name": "version"
+            },
+            {
+              "type": "git_merge_tree_flag_t",
+              "name": "flags"
+            },
+            {
+              "type": "unsigned int",
+              "name": "rename_threshold"
+            },
+            {
+              "type": "unsigned int",
+              "name": "target_limit"
+            },
+            {
+              "type": "git_diff_similarity_metric *",
+              "name": "metric",
+              "ignore": true
+            },
+            {
+              "type": "git_merge_file_favor_t",
+              "name": "file_favor"
+            }
+          ],
+          "used": {
+            "needs": [
+              "git_merge_init_options"
+            ]
           }
-        ],
-        "used": {
-          "needs": [
-            "git_merge_init_options"
-          ]
         }
-      }
-    ],
-    [
-      "git_off_t",
-      {
-        "type": "enum"
-      }
-    ],
-    [
-      "git_remote_autotag_option_t",
-      {
-        "type": "enum"
-      }
-    ],
-    [
-      "git_time_t",
-      {
-        "type": "enum"
-      }
-    ],
-    [
-      "git_trace_level_t",
-      {
-        "type": "enum"
-      }
+      ],
+      [
+        "git_off_t",
+        {
+          "type": "enum"
+        }
+      ],
+      [
+        "git_remote_autotag_option_t",
+        {
+          "type": "enum"
+        }
+      ],
+      [
+        "git_time_t",
+        {
+          "type": "enum"
+        }
+      ],
+      [
+        "git_trace_level_t",
+        {
+          "type": "enum"
+        }
+      ]
     ]
-  ]
+  }
 }
@@ -8,9 +8,15 @@ var descriptor = require("./descriptor.json");
 var libgit2 = require("./v" + version + ".json");
 var supplement = require("./libgit2-supplement.json");
 
+libgit2.types.forEach(function(type) {
+  if (supplement.types[type[0]]){
+    _.merge(type[1], supplement.types[type[0]]);
+  }
+});
 
 // libgit2's docs aren't complete so we'll add in what they're missing here
-Array.prototype.push.apply(libgit2.types, supplement.types);
+Array.prototype.push.apply(libgit2.types, supplement.new.types);
+
 
 var output = [];
 var groupNames = [];
 
@@ -15,7 +15,7 @@ extern "C" {
 #include "{{ dependency }}"
 {%endeach%}
 
-{%if !needsForwardDeclaration%}
+{%if needsForwardDeclaration == true%}
 // Forward declaration.
 struct {{ cType }} {
   {%each fields as field%}
 
@@ -186,7 +186,7 @@ var Utils = {
       Utils.decorateField(field, allFields, fieldOverrides[field.name] || {});
     });
 
-    typeDef.needsForwardDeclaration = typeDef.decl !== typeDef.cType;
+    typeDef.needsForwardDeclaration = typeDef.decl === typeDef.cType;
 
     _.merge(typeDef, partialOverrides);
   },
 
@@ -60,7 +60,7 @@ Commit.prototype.getEntry = function(path, callback) {
 
 /**
  * Walk the history from this commit backwards.
- * An EventEmitter is returned that will emit a "commit" event for each 
+ * An EventEmitter is returned that will emit a "commit" event for each
  * commit in the history, and one "end" event when the walk is completed.
  * Don"t forget to call `start()` on the returned event.
  *
@@ -166,7 +166,7 @@ Commit.prototype.parents = function() {
 };
 
 /**
- * Generate an array of diff trees showing changes between this commit 
+ * Generate an array of diff trees showing changes between this commit
  * and its parent(s).
  *
  * @param {Function} callback
 
@@ -3,12 +3,6 @@ var normalizeOid = require("./util/normalize_oid");
 
 var Revwalk = NodeGit.Revwalk;
 
-// Backwards compatibility.
-Object.defineProperty(NodeGit, "RevWalk", {
-  value: Revwalk,
-  enumerable: false
-});
-
 var oldSorting = Revwalk.prototype.sorting;
 
 /**
 
@@ -3,12 +3,6 @@ var NodeGit = require("../");
 
 var TreeEntry = NodeGit.TreeEntry;
 
-// Backwards compatibility.
-Object.defineProperty(TreeEntry.prototype, "name", {
-  value: TreeEntry.prototype.filename,
-  enumerable: false
-});
-
 /**
  * Refer to vendor/libgit2/include/git2/types.h for filemode definitions.
  *
 
@@ -8,7 +8,7 @@ describe("Oid", function() {
   var Oid = require("../../lib/oid");
 
   before(function() {
-    this.oid = Oid.fromstr(oid);
+    this.oid = Oid.fromString(oid);
   });
 
   it("can convert a string to an oid", function() {