diff --git a/misc/gedkeeper/Makefile b/misc/gedkeeper/Makefile
index 5904196a1c6c..d3e29a7007d1 100644
--- a/misc/gedkeeper/Makefile
+++ b/misc/gedkeeper/Makefile
@@ -1,54 +1,54 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	gedkeeper
-PORTVERSION=	2.17.0
+PORTVERSION=	2.18.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	misc
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Personal genealogical database editor
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	msbuild:devel/msbuild
 LIB_DEPENDS=	libgdiplus.so:x11-toolkits/libgdiplus
 
 USES=		desktop-file-utils mono shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	Serg-Norseman
 GH_PROJECT=	GEDKeeper
 
 _BUILD_TYPE=	Release
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 
 do-build:
 	cd ${BUILD_WRKSRC} && msbuild projects/GEDKeeper2.linux.sln \
 		/p:Configuration=${_BUILD_TYPE} /p:Platform="x86" \
 		/p:MonoCS=true # /p:TargetFrameworkVersion=v4.5
 
 do-install:
 	${PRINTF} '#!/bin/sh\n\nexec mono ${DATADIR}/GEDKeeper2.exe\
 		"$$@"\n' > ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${INSTALL_WRKSRC} && ${CP} -a *.dll GEDKeeper2.exe \
 		locales plugins samples scripts ${STAGEDIR}${DATADIR}
 	@${RM} ${STAGEDIR}${DATADIR}/scripts/readme.txt
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/deploy/gedkeeper.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/deploy/gedkeeper.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/deploy/application-x-gedkeeper.xml \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/deploy/gedkeeper.appdata.xml \
 		${STAGEDIR}${PREFIX}/share/metainfo
 
 do-test:
 	cd ${TEST_WRKSRC} && TEMP=/tmp nunit-console \
 		projects/GKTests/bin/${_BUILD_TYPE}/GKTests.dll
 
 .include <bsd.port.mk>
 
 PATCH_ARGS+=	-l
diff --git a/misc/gedkeeper/distinfo b/misc/gedkeeper/distinfo
index 2b66e52a0a02..f5c150cc6102 100644
--- a/misc/gedkeeper/distinfo
+++ b/misc/gedkeeper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615741723
-SHA256 (Serg-Norseman-GEDKeeper-v2.17.0_GH0.tar.gz) = 4b7404c6b2d8eacacdf96f281c877995625eaf22dd57db9f93036ede343eaac4
-SIZE (Serg-Norseman-GEDKeeper-v2.17.0_GH0.tar.gz) = 18598037
+TIMESTAMP = 1627494870
+SHA256 (Serg-Norseman-GEDKeeper-v2.18.0_GH0.tar.gz) = 151b366bb26045e735f716c99d826ebd7e6e25353c69ec08661f0ac9803c9cd8
+SIZE (Serg-Norseman-GEDKeeper-v2.18.0_GH0.tar.gz) = 18619958