diff --git a/sysutils/UEFITool/Makefile b/sysutils/UEFITool/Makefile
index 701f9d78402b..5645e0cf1cc2 100644
--- a/sysutils/UEFITool/Makefile
+++ b/sysutils/UEFITool/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	UEFITool
 DISTVERSIONPREFIX=	A
-DISTVERSION=	60
+DISTVERSION=	61
 CATEGORIES=	sysutils
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	UEFI images parser
 WWW=		https://github.com/LongSoft/UEFITool
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE.md
 
 USES=		compiler:c++11-lang gl qmake:outsource qt:5
 USE_GITHUB=	yes
 USE_GL=		gl
 USE_QT=		core gui widgets buildtools:build qmake:build
 
 WRKSRC_SUBDIR=	${PORTNAME}
 GH_ACCOUNT=	LongSoft
 
 PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/UEFITool/distinfo b/sysutils/UEFITool/distinfo
index 408d7fcb7aa4..37f510b4ac63 100644
--- a/sysutils/UEFITool/distinfo
+++ b/sysutils/UEFITool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661633254
-SHA256 (LongSoft-UEFITool-A60_GH0.tar.gz) = ece8e75951ef707c8e59e46afc03e2c4b4d3db5d423727e3bbbc2cbfb01266bc
-SIZE (LongSoft-UEFITool-A60_GH0.tar.gz) = 615603
+TIMESTAMP = 1662933205
+SHA256 (LongSoft-UEFITool-A61_GH0.tar.gz) = 54fbc130a71e6474f0f9342166465670dff0dac9ba743fe162ae2c9912826155
+SIZE (LongSoft-UEFITool-A61_GH0.tar.gz) = 942753
diff --git a/sysutils/UEFITool/files/patch-common_kaitai_kaitaistream.cpp b/sysutils/UEFITool/files/patch-common_kaitai_kaitaistream.cpp
new file mode 100644
index 000000000000..f94149671a32
--- /dev/null
+++ b/sysutils/UEFITool/files/patch-common_kaitai_kaitaistream.cpp
@@ -0,0 +1,15 @@
+--- ../common/kaitai/kaitaistream.cpp.orig	2022-09-11 22:19:28 UTC
++++ ../common/kaitai/kaitaistream.cpp
+@@ -20,8 +20,10 @@
+ #define bswap_32(x) _byteswap_ulong(x)
+ #define bswap_64(x) _byteswap_uint64(x)
+ #else // !__APPLE__ or !_MSC_VER
+-#include <endian.h>
+-#include <byteswap.h>
++#include <sys/endian.h>
++#define bswap_16(x) bswap16(x)
++#define bswap_32(x) bswap32(x)
++#define bswap_64(x) bswap64(x)
+ #endif
+ 
+ #include <iostream>