diff --git a/devel/py-pygit2/Makefile b/devel/py-pygit2/Makefile
index 3372f233e30b..639c8b937be8 100644
--- a/devel/py-pygit2/Makefile
+++ b/devel/py-pygit2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pygit2
-PORTVERSION=	0.20.3
+PORTVERSION=	0.21.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,10 +12,13 @@ COMMENT=	Python bindings for libgit2
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgit2.so.0.20.0:${PORTSDIR}/devel/libgit2
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:${PORTSDIR}/devel/py-cffi
+LIB_DEPENDS=	libgit2.so.${PORTVERSION}:${PORTSDIR}/devel/libgit2
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
+MAKE_ENV=	LIBGIT2=${LOCALBASE}
 
 .include <bsd.port.mk>
diff --git a/devel/py-pygit2/distinfo b/devel/py-pygit2/distinfo
index bf3d0f68d608..6e9ff81aa008 100644
--- a/devel/py-pygit2/distinfo
+++ b/devel/py-pygit2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pygit2-0.20.3.tar.gz) = 97196f311465a2eda92e8f6c28931824bb252513e5664b2e9c4617081dd9b1c8
-SIZE (pygit2-0.20.3.tar.gz) = 146253
+SHA256 (pygit2-0.21.0.tar.gz) = cdc24084ba066234dfffd58f22e265b23f76a064b3069777e5009ff1679f2574
+SIZE (pygit2-0.21.0.tar.gz) = 150281