diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
index 460b7fba2..c7df8dfb2 100644
--- a/generate/input/descriptor.json
+++ b/generate/input/descriptor.json
@@ -1348,6 +1348,13 @@
         "git_remote_rename": {
           "ignore": true
         },
+        "git_remote_set_callbacks": {
+          "args": {
+            "callbacks": {
+              "saveArg": true
+            }
+          }
+        },
         "git_remote_set_fetch_refspecs": {
           "ignore": true
         },
diff --git a/generate/templates/partials/sync_function.cc b/generate/templates/partials/sync_function.cc
index 16b0aa3dc..452e02920 100644
--- a/generate/templates/partials/sync_function.cc
+++ b/generate/templates/partials/sync_function.cc
@@ -18,6 +18,18 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
         {%if not arg.isCallbackFunction %}
           {%if not arg.payloadFor %}
             {%partial convertFromV8 arg %}
+            {%if arg.saveArg %}
+  Persistent<Object> {{ arg.name }};
+  Handle<Object> {{ arg.name }}Handle(args[{{ arg.jsArg }}]->ToObject());
+  NanAssignPersistent({{ arg.name }}, {{ arg.name }}Handle);
+  {{ cppClassName }} *thisObj = ObjectWrap::Unwrap<{{ cppClassName }}>(args.This());
+
+  if (thisObj->{{ cppFunctionName }}_{{ arg.name }} != NULL) {
+    NanDisposePersistent(*thisObj->{{ cppFunctionName }}_{{ arg.name }});
+  }
+
+  thisObj->{{ cppFunctionName }}_{{ arg.name }} = &{{ arg.name }};
+            {%endif%}
           {%endif%}
         {%endif%}
       {%endif%}
diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc
index 5efa227af..3a7abddbb 100644
--- a/generate/templates/templates/class_content.cc
+++ b/generate/templates/templates/class_content.cc
@@ -29,6 +29,16 @@ using namespace node;
   {{ cppClassName }}::{{ cppClassName }}({{ cType }} *raw, bool selfFreeing) {
     this->raw = raw;
     this->selfFreeing = selfFreeing;
+
+    {% each functions as function %}
+      {% if not function.ignore %}
+        {% each function.args as arg %}
+          {% if arg.saveArg %}
+    {{ function.cppFunctionName }}_{{ arg.name }} = NULL;
+          {% endif %}
+        {% endeach %}
+      {% endif %}
+    {% endeach %}
   }
 
   {{ cppClassName }}::~{{ cppClassName }}() {
@@ -37,6 +47,21 @@ using namespace node;
         {{ freeFunctionName }}(this->raw);
       }
     {% endif %}
+
+    // this will cause an error if you have a non-self-freeing object that also needs
+    // to save values. Since the object that will eventually free the object has no
+    // way of knowing to free these values.
+    {% each function as function %}
+      {% if not function.ignore %}
+        {% each function.args as arg %}
+          {% if arg.saveArg %}
+    if ({{ function.cppFunctionName }}_{{ arg.name }} != NULL) {
+      NanDisposePersistent(&{{ function.cppFunctionName }}_{{ arg.name }});
+    }
+          {% endif %}
+        {% endeach %}
+      {% endif %}
+    {% endeach %}
   }
 
   void {{ cppClassName }}::InitializeComponent(Handle<v8::Object> target) {
diff --git a/generate/templates/templates/class_header.h b/generate/templates/templates/class_header.h
index 1f4e18aba..74e711a1e 100644
--- a/generate/templates/templates/class_header.h
+++ b/generate/templates/templates/class_header.h
@@ -73,12 +73,26 @@ class {{ cppClassName }} : public ObjectWrap {
         {% endeach %}
       {% endif %}
     {% endeach %}
+
+
   private:
+
+
     {%if cType%}
     {{ cppClassName }}({{ cType }} *raw, bool selfFreeing);
     ~{{ cppClassName }}();
     {%endif%}
 
+    {% each functions as function %}
+      {% if not function.ignore %}
+        {% each function.args as arg %}
+          {% if arg.saveArg %}
+    Persistent<Object> *{{ function.cppFunctionName }}_{{ arg.name }};
+          {% endif %}
+        {% endeach %}
+      {% endif %}
+    {% endeach %}
+
     static NAN_METHOD(JSNewFunction);
 
     {%each fields as field%}