diff --git a/devel/got/Makefile b/devel/got/Makefile
index db091d23e0f4..7023d351e623 100644
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	got
-PORTVERSION=	0.53
+PORTVERSION=	0.54
 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 6c5916f0fe07..a0b4a801e887 100644
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624457436
-SHA256 (got-0.53.tar.gz) = 2401652e959457ddba67eef93a31b3dd6efea89198a3c02eebc964edb03961f3
-SIZE (got-0.53.tar.gz) = 519143
+TIMESTAMP = 1625775299
+SHA256 (got-0.54.tar.gz) = c05585240d7ab8f3bbd30649bcb5595e3814e209c6141910344cdf464d06671b
+SIZE (got-0.54.tar.gz) = 526945
diff --git a/devel/got/files/openbsd-compat/openbsd-compat.h b/devel/got/files/openbsd-compat/openbsd-compat.h
index 30267cfab011..5615867b90c7 100644
--- a/devel/got/files/openbsd-compat/openbsd-compat.h
+++ b/devel/got/files/openbsd-compat/openbsd-compat.h
@@ -1,76 +1,40 @@
 /*
  * Compatibility mappings for system headers and
  * prototypes for functions in libopenbsd-compat.
  */
 
 #ifndef _OPENBSD_COMPAT_H_
 #define _OPENBSD_COMPAT_H_
 
 /*
  * <sys/cdefs.h>
  */
 #define __dead __dead2
 
-/*
- * <sys/queue.h>
- */
-#define SIMPLEQ_HEAD(name, type) \
-	STAILQ_HEAD(name, type)
-#define SIMPLEQ_HEAD_INITIALIZER(head) \
-	STAILQ_HEAD_INITIALIZER(head)
-#define SIMPLEQ_ENTRY(type) \
-	STAILQ_ENTRY(type)
-#define SIMPLEQ_FIRST(head) \
-	STAILQ_FIRST(head)
-#define SIMPLEQ_END(head) \
-	NULL
-#define SIMPLEQ_EMPTY(head) \
-	STAILQ_EMPTY(head)
-#define SIMPLEQ_NEXT(elm, field) \
-	STAILQ_NEXT(elm, field)
-#define SIMPLEQ_FOREACH(var, head, field) \
-	STAILQ_FOREACH(var, head, field)
-#define SIMPLEQ_FOREACH_SAFE(var, head, field, tvar) \
-	STAILQ_FOREACH_SAFE(var, head, field, tvar)
-#define SIMPLEQ_INIT(head) \
-	STAILQ_INIT(head)
-#define SIMPLEQ_INSERT_HEAD(head, elm, field) \
-	STAILQ_INSERT_HEAD(head, elm, field)
-#define SIMPLEQ_INSERT_TAIL(head, elm, field) \
-	STAILQ_INSERT_TAIL(head, elm, field)
-#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) \
-	STAILQ_INSERT_AFTER(head, listelm, elm, field)
-#define SIMPLEQ_REMOVE_HEAD(head, field) \
-	STAILQ_REMOVE_HEAD(head, field)
-#define SIMPLEQ_REMOVE_AFTER(head, elm, field) \
-	STAILQ_REMOVE_AFTER(head, elm, field)
-#define SIMPLEQ_CONCAT(head1, head2) \
-	STAILQ_CONCAT(head1, head2)
-
 /*
  * <fcntl.h>
  */
 #define open(...)	open_posix(__VA_ARGS__)
 #define openat(...)	openat_posix(__VA_ARGS__)
 
 int	open_posix(const char *path, int flags, ...);
 int	openat_posix(int fd, const char *path, int flags, ...);
 
 /*
  * <stdlib.h>
  */
 void	freezero(void *, size_t);
 void	*recallocarray(void *, size_t, size_t, size_t);
 
 /*
  * <unistd.h>
  */
 int	getdtablecount(void);
 
 /* void -> int */
 #define closefrom(fd)			(closefrom(fd), 0)
 
 #define pledge(promises, execpromises)	0
 #define unveil(path, permissions)	0
 
 #endif	/* _OPENBSD_COMPAT_H_ */
diff --git a/devel/got/files/patch-lib_repository__admin.c b/devel/got/files/patch-lib_repository__admin.c
deleted file mode 100644
index 347d9f4d0a78..000000000000
--- a/devel/got/files/patch-lib_repository__admin.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/repository_admin.c.orig	2021-06-23 15:24:57 UTC
-+++ lib/repository_admin.c
-@@ -22,6 +22,7 @@
- #include <sys/wait.h>
- 
- #include <dirent.h>
-+#include <endian.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdint.h>
diff --git a/devel/got/files/patch-regress_cmdline_Makefile b/devel/got/files/patch-regress_cmdline_Makefile
index 445ae5377614..9328dbe1d3f8 100644
--- a/devel/got/files/patch-regress_cmdline_Makefile
+++ b/devel/got/files/patch-regress_cmdline_Makefile
@@ -1,10 +1,10 @@
---- regress/cmdline/Makefile.orig	2021-06-22 19:37:49 UTC
+--- regress/cmdline/Makefile.orig	2021-07-03 20:38:45 UTC
 +++ regress/cmdline/Makefile
-@@ -83,4 +83,6 @@ tree:
- pack:
- 	./pack.sh -q -r "$(GOT_TEST_ROOT)"
+@@ -87,4 +87,6 @@ cleanup:
+ 	./cleanup.sh -q -r "$(GOT_TEST_ROOT)"
+ 
  
 -.include <bsd.regress.mk>
 +regress: ${REGRESS_TARGETS} .PHONY .SILENT
 +
 +.include <bsd.prog.mk>