diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
index 532a99a..886aa9f 100644
--- git-changebar/src/gcb-plugin.c
+++ git-changebar/src/gcb-plugin.c
@@ -238,7 +238,7 @@ static void
 clear_cached_blob_contents (void)
 {
   if (G_blob_contents.ptr) {
-    git_buf_free (&G_blob_contents);
+    git_buf_dispose (&G_blob_contents);
     buf_zero (&G_blob_contents);
   }
   G_blob_contents_tag = 0;
@@ -293,7 +293,7 @@ free_job (gpointer data)
   
   /* unlikely, but if we still have the buffer, free it */
   if (job->buf.ptr) {
-    git_buf_free (&job->buf);
+    git_buf_dispose (&job->buf);
   }
   g_free (job->path);
   g_slice_free1 (sizeof *job, job);
@@ -463,7 +463,7 @@ worker_thread (gpointer data)
       
       if (relpath) {
         if (! repo_get_file_blob_contents (repo, relpath, &job->buf, 0)) {
-          git_buf_free (&job->buf);
+          git_buf_dispose (&job->buf);
           buf_zero (&job->buf);
         }
         
@@ -1481,7 +1481,7 @@ plugin_init (GeanyData *data)
   G_queue             = NULL;
   
   if (git_libgit2_init () < 0) {
-    const git_error *err = giterr_last ();
+    const git_error *err = git_error_last ();
     g_warning ("Failed to initialize libgit2: %s", err ? err->message : "?");
     return;
   }