diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile
index 156569027afe..e0c94286ab9f 100644
--- a/devel/git-cinnabar/Makefile
+++ b/devel/git-cinnabar/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.5.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	57f8d0171423.patch:-p1 # https://github.com/glandium/git-cinnabar/pull/277
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Git remote helper to interact with Mercurial repositories
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${NONEXISTENT}:devel/git:configure
 RUN_DEPENDS=	git:devel/git
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glandium
 
 USES=		gmake python:3.6+,run shebangfix
 TARGET_ORDER_OVERRIDE=	510:fix-shebang # after do-patch
 SHEBANG_FILES=	${PORTNAME} git-remote-hg
 ALL_TARGET=	${PORTNAME}-helper
 MAKE_ENV=	${:!${MAKE} -V MAKE_ENV -C ${.CURDIR:H}/git!}
 MAKE_ARGS=	SUBMODULE_STATUS=dummy ${:!${MAKE} -V MAKE_ARGS -C ${.CURDIR:H}/git!}
 CFLAGS+=	-ffunction-sections -fdata-sections
 LDFLAGS+=	-Wl,--gc-sections
 .export		CPPFLAGS CFLAGS CXXFLAGS LDFLAGS # :configure
 DATADIR=	${PREFIX}/libexec/git-core
 PORTDATA=	*
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-configure:
 	@${TAR} cf - -C$$(${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git) . | \
 		${TAR} xof - -C${WRKSRC}/git-core
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${WRKSRC}/git-remote-hg \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/git-core/${PORTNAME}-helper \
 		${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTNAME:S/git-//}" \
 		${STAGEDIR}${DATADIR}/pythonlib)
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/git-cinnabar/files/patch-git-2.33 b/devel/git-cinnabar/files/patch-git-2.33
new file mode 100644
index 000000000000..469b600e802c
--- /dev/null
+++ b/devel/git-cinnabar/files/patch-git-2.33
@@ -0,0 +1,27 @@
+https://github.com/glandium/git-cinnabar/commit/ea33ee10ac39
+
+--- helper/GIT-VERSION.mk.orig	2021-03-31 21:58:42 UTC
++++ helper/GIT-VERSION.mk
+@@ -1,2 +1,2 @@
+-GIT_VERSION ?= v2.32.0
++GIT_VERSION ?= v2.33.0
+ WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1
+--- helper/csum-file.c.patch.orig	2021-03-31 21:58:42 UTC
++++ helper/csum-file.c.patch
+@@ -1,8 +1,8 @@
+ diff --git a/csum-file.c b/csum-file.c
+-index 7510950fa3..19d02e3a63 100644
++index c951cf8277..1215459b01 100644
+ --- a/csum-file.c
+ +++ b/csum-file.c
+-@@ -86,7 +86,7 @@ int finalize_hashfile(struct hashfile *f, unsigned char *result, unsigned int fl
++@@ -91,7 +91,7 @@ int finalize_hashfile(struct hashfile *f, unsigned char *result, unsigned int fl
+  	return fd;
+  }
+  
+@@ -10,4 +10,4 @@ index 7510950fa3..19d02e3a63 100644
+ +void real_hashwrite(struct hashfile *f, const void *buf, unsigned int count)
+  {
+  	while (count) {
+- 		unsigned left = sizeof(f->buffer) - f->offset;
++ 		unsigned left = f->buffer_len - f->offset;