diff --git a/devel/py-pygit2/Makefile b/devel/py-pygit2/Makefile
index 93826e76cc62..af1f58b97dc6 100644
--- a/devel/py-pygit2/Makefile
+++ b/devel/py-pygit2/Makefile
@@ -1,35 +1,35 @@
 # Created by: William Grzybowski <wg@FreeBSD.org>
 
 # Also update devel/libgit2, devel/libgit2-glib, devel/rubygem-rugged
 
 PORTNAME=	pygit2
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Python bindings for libgit2
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>1.0:devel/py-cffi@${PY_FLAVOR}
 BUILD_DEPENDS=	${MY_DEPENDS}
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 RUN_DEPENDS=	${MY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}cached-property>=0:devel/py-cached-property@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 MAKE_ENV=	LIBGIT2=${LOCALBASE}
 PYDISTUTILS_TEST_TARGET?=	test
 
 do-test:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_TEST_TARGET} ${PYDISTUTILS_TESTARGS})
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pygit2/_*git2*.so \
 
 .include <bsd.port.mk>
diff --git a/devel/py-pygit2/distinfo b/devel/py-pygit2/distinfo
index 6f1d53103889..6c36c3ab1c93 100644
--- a/devel/py-pygit2/distinfo
+++ b/devel/py-pygit2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618208442
-SHA256 (pygit2-1.5.0.tar.gz) = 9711367bd05f96ad6fc9c91d88fa96126ba2d1f1c3ea6f23c11402c243d66a20
-SIZE (pygit2-1.5.0.tar.gz) = 255958
+TIMESTAMP = 1631174621
+SHA256 (pygit2-1.6.1.tar.gz) = c3303776f774d3e0115c1c4f6e1fc35470d15f113a7ae9401a0b90acfa1661ac
+SIZE (pygit2-1.6.1.tar.gz) = 258338
diff --git a/devel/py-pygit2/files/patch-src_types.h b/devel/py-pygit2/files/patch-src_types.h
new file mode 100644
index 000000000000..4bfc3c6e8a95
--- /dev/null
+++ b/devel/py-pygit2/files/patch-src_types.h
@@ -0,0 +1,13 @@
+--- src/types.h.orig	2021-09-09 11:47:02 UTC
++++ src/types.h
+@@ -32,8 +32,8 @@
+ #include <Python.h>
+ #include <git2.h>
+ 
+-#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 1)
+-#error You need a compatible libgit2 version (1.1.x)
++#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 2)
++#error You need a compatible libgit2 version (1.2.x)
+ #endif
+ 
+ /*