diff --git a/common/shlibs b/common/shlibs
index f02af5cf58e..d83c2b6a1c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1353,7 +1353,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
 libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
 libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_1
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82b..00000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
- 
- include(AddClarTest)
- add_clar_test(libgit2_tests offline             -v -xonline)
--add_clar_test(libgit2_tests invasive            -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive            -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online              -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert   -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon           -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489..3f316543f36 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
 diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
 --- a/tests/util/path.c
 +++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
  	cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
  #else
  	cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
--	cl_assert_equal_i(is_cur, 0);
-+	//cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+-	cl_assert_equal_i(is_cur, (geteuid() == 0));
++	//cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
  
  	cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
  #endif
diff --git a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
new file mode 100644
index 00000000000..8d24809f244
--- /dev/null
+++ b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
@@ -0,0 +1,24 @@
+From 47ebf589250159d6a98bd91625aefd2e1383ec26 Mon Sep 17 00:00:00 2001
+From: Oliver Reiche <oliver.reiche@gmail.com>
+Date: Wed, 3 May 2023 12:57:06 +0200
+Subject: [PATCH] Fix missing oid type for "fake" repositories
+
+... otherwise git_tree__parse_raw() will fail to obtain
+the correct oid size, which causes the entire parse to fail.
+---
+ src/libgit2/repository.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libgit2/repository.c b/src/libgit2/repository.c
+index 804e436abeb..c45c5855058 100644
+--- a/src/libgit2/repository.c
++++ b/src/libgit2/repository.c
+@@ -1152,6 +1152,8 @@ int git_repository_wrap_odb(git_repository **repo_out, git_odb *odb)
+ 	repo = repository_alloc();
+ 	GIT_ERROR_CHECK_ALLOC(repo);
+ 
++	repo->oid_type = GIT_OID_DEFAULT;
++
+ 	git_repository_set_odb(repo, odb);
+ 	*repo_out = repo;
+ 
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 9d9da1496d6..24b56f20099 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2'
 pkgname=libgit2
-version=1.5.1
-revision=2
+version=1.6.4
+revision=1
 build_style=cmake
 configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
 hostmakedepends="python3 pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
 homepage="https://libgit2.org"
 distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"