diff --git a/devel/got/Makefile b/devel/got/Makefile
index ad0293018e1a..8eb25dc6825f 100644
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	got
-DISTVERSION=	0.89
+DISTVERSION=	0.90
 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 322050f10397..29e9377887d1 100644
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685997981
-SHA256 (got-0.89.tar.gz) = c0d2c7af86754dba2cdab3d3e8b917bd8abb2a0b3d74058cc092772ff11d1d5c
-SIZE (got-0.89.tar.gz) = 825004
+TIMESTAMP = 1687559108
+SHA256 (got-0.90.tar.gz) = 35ae134f37848ecfb1ced0e18d0bcfbaada056e3e603dcaa8333b08ffbc7eb1f
+SIZE (got-0.90.tar.gz) = 830029
diff --git a/devel/got/files/patch-lib_repository__admin.c b/devel/got/files/patch-lib_repository__admin.c
new file mode 100644
index 000000000000..a7be54c5f512
--- /dev/null
+++ b/devel/got/files/patch-lib_repository__admin.c
@@ -0,0 +1,11 @@
+--- lib/repository_admin.c.orig	2023-06-24 15:03:03 UTC
++++ lib/repository_admin.c
+@@ -620,7 +620,7 @@ got_repo_cleanup_prepare(struct got_repository *repo,
+     struct got_lockfile **lk)
+ {
+ 	const struct got_error *err;
+-	char myname[HOST_NAME_MAX + 1];
++	char myname[_POSIX_HOST_NAME_MAX + 1];
+ 
+ 	if (gethostname(myname, sizeof(myname)) == -1)
+ 		return got_error_from_errno("gethostname");