diff --git a/devel/mk-configure/Makefile b/devel/mk-configure/Makefile
index dfc95be0c533..ee25b565193a 100644
--- a/devel/mk-configure/Makefile
+++ b/devel/mk-configure/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	mk-configure
-PORTVERSION=	0.38.2
-PORTREVISION=	2
+PORTVERSION=	0.40.0
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/mk-configure/mk-configure/mk-configure-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Lightweight, easy to use replacement for GNU autotools
-WWW=		https://sourceforge.net/projects/mk-configure/
+WWW=		https://sourceforge.net/projects/mk-configure/ \
+		https://github.com/cheusov/mk-configure
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
+INSTALL_TARGET=	installdirs install install-doc
+MAKE_ARGS=	MANDIR=${PREFIX}/share/man
 MAKE_JOBS_UNSAFE=	yes
 NO_ARCH=	yes
 
-MAKE_ARGS=	MANDIR=${PREFIX}/share/man
-INSTALL_TARGET=	installdirs install install-doc
-
 PORTDATA=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install-EXAMPLES-on:
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 do-test:
 	${SETENV} NOSUBDIR="tests/pkg_config_2 tests/predopost_targets \
 		tests/lua_dirs examples/hello_lua examples/hello_lua2 \
 		examples/hello_lua3" CPPFLAGS='-I/usr/local/include' \
 		LDFLAGS='-L/usr/local/lib -Wl,-rpath /usr/local/lib' \
 		${INSTALL_WRKSRC}/scripts/mkcmake -C ${INSTALL_WRKSRC} test
 
 .include <bsd.port.mk>
diff --git a/devel/mk-configure/distinfo b/devel/mk-configure/distinfo
index 6d366e69384c..5c7e2d4a93f9 100644
--- a/devel/mk-configure/distinfo
+++ b/devel/mk-configure/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672169933
-SHA256 (mk-configure-0.38.2.tar.gz) = 1e705e11047515aea67327ba67010affcbb77f2f0736eb84a5080249f4ab483e
-SIZE (mk-configure-0.38.2.tar.gz) = 359518
+TIMESTAMP = 1752266006
+SHA256 (mk-configure-0.40.0.tar.gz) = 2a422f78752d25f37800cdfe5e96f1d081066837feefb8c8109db4e1daf51d4d
+SIZE (mk-configure-0.40.0.tar.gz) = 366236
diff --git a/devel/mk-configure/pkg-plist b/devel/mk-configure/pkg-plist
index 99f8fb5c8595..201ec5229d88 100644
--- a/devel/mk-configure/pkg-plist
+++ b/devel/mk-configure/pkg-plist
@@ -1,34 +1,34 @@
 bin/mkc_check_compiler
 bin/mkc_check_custom
 bin/mkc_check_decl
 bin/mkc_check_funclib
 bin/mkc_check_header
 bin/mkc_check_prog
 bin/mkc_check_sizeof
 bin/mkc_check_version
 bin/mkc_compiler_settings
 bin/mkc_install
 bin/mkc_which
 bin/mkcmake
 libexec/mk-configure/mkc_check_common.sh
 libexec/mk-configure/mkc_get_deps
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/NOTES
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 share/man/man1/mkc_check_compiler.1.gz
 share/man/man1/mkc_check_custom.1.gz
 share/man/man1/mkc_check_decl.1.gz
 share/man/man1/mkc_check_funclib.1.gz
 share/man/man1/mkc_check_header.1.gz
 share/man/man1/mkc_check_prog.1.gz
 share/man/man1/mkc_check_sizeof.1.gz
 share/man/man1/mkc_check_version.1.gz
 share/man/man1/mkc_compiler_settings.1.gz
 share/man/man1/mkc_install.1.gz
 share/man/man1/mkc_which.1.gz
 share/man/man1/mkcmake.1.gz
 share/man/man7/mk-configure.7.gz
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/NOTES
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/TODO