diff --git a/devel/got/Makefile b/devel/got/Makefile
index ac0e43500432..994e490e71ec 100644
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	got
-DISTVERSION=	0.86
+DISTVERSION=	0.87
 CATEGORIES=	devel
 MASTER_SITES=	https://gameoftrees.org/releases/
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Game of Trees version control system
 WWW=		https://gameoftrees.org
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 USES=		uidfix
 
 CONFLICTS_INSTALL=	p5-App-GitGot
 
 # Insert #include "openbsd-compat.h" into each source file,
 # after the <...> includes and before the "..." ones.
 n=		${.newline}
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.[cy]' -exec \
 	    ${REINPLACE_CMD} '1,/^#include "/{ \
 	    /^#include "/i\$n#include "openbsd-compat.h"\$n$n}' \
 	    {} +
 	${CP} -R ${FILESDIR}/openbsd-compat ${WRKSRC}
 
 # The regression test suite requires:
 #  installed got
 #  installed git
 #  ssh to 127.0.0.1
 regress:
 	@(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress)
 
 .include <bsd.port.mk>
diff --git a/devel/got/distinfo b/devel/got/distinfo
index 4179faf6d8b9..3f320bd1a955 100644
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678656896
-SHA256 (got-0.86.tar.gz) = 2473a3afc5356d1999ef8fea7ff3f73ea64919462adf87105424b0fa3bab87ec
-SIZE (got-0.86.tar.gz) = 806708
+TIMESTAMP = 1681998178
+SHA256 (got-0.87.tar.gz) = 74f8b5e0ce1158c877628e0d95a42b8e1ce1fe0afc2fc01911ba4ea471978605
+SIZE (got-0.87.tar.gz) = 822791
diff --git a/devel/got/files/patch-regress_Makefile b/devel/got/files/patch-regress_Makefile
index 4e9eb445defa..89edb028f0d4 100644
--- a/devel/got/files/patch-regress_Makefile
+++ b/devel/got/files/patch-regress_Makefile
@@ -1,8 +1,10 @@
---- regress/Makefile.orig	2021-03-16 21:43:57 UTC
+--- regress/Makefile.orig	2023-04-15 23:28:20 UTC
 +++ regress/Makefile
-@@ -1,3 +1,5 @@
- SUBDIR = cmdline delta deltify idset path fetch
- 
-+SUBDIR_TARGETS+= regress
+@@ -1,4 +1,6 @@
+-SUBDIR = cmdline delta deltify idset path fetch
++SUBDIR = cmdline delta deltify idset path fetch tog
 +
- .include <bsd.subdir.mk>
++SUBDIR_TARGETS+= regress
+ 
+ .if make(clean)
+ SUBDIR += gotd 
diff --git a/devel/got/files/patch-regress_tog_Makefile b/devel/got/files/patch-regress_tog_Makefile
new file mode 100644
index 000000000000..effb7a8466fc
--- /dev/null
+++ b/devel/got/files/patch-regress_tog_Makefile
@@ -0,0 +1,10 @@
+--- regress/tog/Makefile.orig	2023-04-17 19:05:41 UTC
++++ regress/tog/Makefile
+@@ -12,4 +12,6 @@ diff:
+ blame:
+ 	./blame.sh -q -r "$(GOT_TEST_ROOT)"
+ 
+-.include <bsd.regress.mk>
++regress: ${REGRESS_TARGETS} .PHONY .SILENT
++
++.include <bsd.prog.mk>