diff --git a/devel/got/Makefile b/devel/got/Makefile
index 8faa8aa023a9..b2b49bfb6b62 100644
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	got
-PORTVERSION=	0.58
+PORTVERSION=	0.59
 CATEGORIES=	devel
 MASTER_SITES=	https://gameoftrees.org/releases/
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Game of Trees version control system
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 USES=		uidfix
 
 # 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
 run-test:
 	@(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress)
 
 .include <bsd.port.mk>
diff --git a/devel/got/distinfo b/devel/got/distinfo
index f06e759ab7bf..e0394f44f97c 100644
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631369078
-SHA256 (got-0.58.tar.gz) = 66cc8c38820189f8316183d95dd9332d3dff1e778a1b73e9b5d76d7da8eee431
-SIZE (got-0.58.tar.gz) = 551129
+TIMESTAMP = 1631649267
+SHA256 (got-0.59.tar.gz) = 5b40e99137dde05a3f0ecd15fc591f15e22d55eb305d3ee27b1bc7aefedd0abe
+SIZE (got-0.59.tar.gz) = 551916
diff --git a/devel/got/files/patch-regress_cmdline_checkout.sh b/devel/got/files/patch-regress_cmdline_checkout.sh
new file mode 100644
index 000000000000..4b80f29b1aa2
--- /dev/null
+++ b/devel/got/files/patch-regress_cmdline_checkout.sh
@@ -0,0 +1,11 @@
+--- regress/cmdline/checkout.sh.orig	2021-09-14 20:09:50 UTC
++++ regress/cmdline/checkout.sh
+@@ -821,7 +821,7 @@ test_checkout_quiet() {
+ 
+ 	echo -n "Checked out refs/heads/master: " >> $testroot/stdout.expected
+ 	git_show_head $testroot/repo >> $testroot/stdout.expected
+-	echo "\nNow shut up and hack" >> $testroot/stdout.expected
++	printf "\nNow shut up and hack\n" >> $testroot/stdout.expected
+ 
+ 	got checkout -q $testroot/repo $testroot/wt > $testroot/stdout
+ 	ret="$?"