diff --git a/include/git2/commit.h b/include/git2/commit.h
index e3e5d7236..8841aa033 100644
--- a/include/git2/commit.h
+++ b/include/git2/commit.h
@@ -543,7 +543,7 @@ typedef int (*git_commit_create_cb)(
 
 /** An array of commits returned from the library */
 typedef struct git_commitarray {
-	git_commit **commits;
+	git_commit *const *commits;
 	size_t count;
 } git_commitarray;
 
diff --git a/src/libgit2/commit.c b/src/libgit2/commit.c
index b2c335e81..2e30c1be9 100644
--- a/src/libgit2/commit.c
+++ b/src/libgit2/commit.c
@@ -1108,7 +1108,7 @@ void git_commitarray_dispose(git_commitarray *array)
 	for (i = 0; i < array->count; i++)
 		git_commit_free(array->commits[i]);
 
-	git__free(array->commits);
+	git__free((git_commit **)array->commits);
 
 	memset(array, 0, sizeof(*array));
 }