diff --git a/devel/kyua/Makefile b/devel/kyua/Makefile
index 9cc111a15458..28ba8530fb60 100644
--- a/devel/kyua/Makefile
+++ b/devel/kyua/Makefile
@@ -1,63 +1,54 @@
 PORTNAME=	kyua
-DISTVERSION=	0.14
-PORTEPOCH=	3
+DISTVERSION=	0.14.1
 CATEGORIES=	devel
+MASTER_SITES=	https://github.com/freebsd/${PORTNAME}/releases/download/${DISTNAME}/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Testing framework for infrastructure software
-WWW=		https://github.com/jmmv/kyua/
+WWW=		https://github.com/freebsd/kyua/
 
 LICENSE=	BSD3CLAUSE
 
-# Since 14.2 the test suite is based on execenv=jail feature of the latest Kyua,
-# and tests(7) are expected to be aligned with Kyua version in the base,
-# while the port is not going to be maintained to avoid double work.
-DEPRECATED=	Consider using base version as tests(7) fail on 14.2 and later
-EXPIRATION_DATE=	2026-04-30
-
 LIB_DEPENDS=	liblutok.so:devel/lutok
 
 USES=		autoreconf lua pkgconfig sqlite
-USE_GITHUB=	yes
-GH_ACCOUNT=	freebsd
-GH_TAGNAME=	c85354e
-USE_CXXSTD=	gnu++11
+USE_CXXSTD=	gnu++14
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--without-doxygen
 MAKE_ARGS=	examplesdir=${EXAMPLESDIR} \
 		pkgdatadir=${DATADIR}
 
 CONFLICTS=	kyua-atf-compat kyua-cli kyua-testers
 
 SUB_FILES=	kyua.conf
 _TESTS_USER=	tests
 SUB_LIST=	TESTS_USER=${_TESTS_USER}
 USERS=		${_TESTS_USER}
 GROUPS=		tests
 
 OPTIONS_DEFINE=		DOCS EXAMPLES TEST
 OPTIONS_DEFAULT=	TEST
 OPTIONS_SUB=		yes
 
 DOCS_MAKE_ARGS_OFF=	doc_DATA=
 EXAMPLES_MAKE_ARGS_OFF=	dist_examples_DATA=
 TEST_BUILD_DEPENDS=	atf>=0.21:devel/atf
 TEST_RUN_DEPENDS=	atf>=0.21:devel/atf
-TEST_CONFIGURE_WITH=	atf
+TEST_CONFIGURE_ENABLE=	atf
 
 # TODO: Get back to IGNORE after the alignment with the dependent ports
 #.if ${OPSYS} == FreeBSD && ${OSREL:R} >= 14
 #IGNORE=		kyua from base must be used for FreeBSD 14.x and newer
 #.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/kyua
 	${INSTALL_DATA} ${WRKDIR}/kyua.conf \
 		${STAGEDIR}${PREFIX}/etc/kyua/kyua.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top \
 		${STAGEDIR}${PREFIX}/tests/Kyuafile
 
 .include <bsd.port.mk>
diff --git a/devel/kyua/distinfo b/devel/kyua/distinfo
index c7b3586fb748..da644d3377f1 100644
--- a/devel/kyua/distinfo
+++ b/devel/kyua/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735891685
-SHA256 (freebsd-kyua-0.14-c85354e_GH0.tar.gz) = d354e0df90cb9d7df2a0bd9f85fd819e8ca3fa54b7d13f33c35d15ee61eee3f1
-SIZE (freebsd-kyua-0.14-c85354e_GH0.tar.gz) = 509081
+TIMESTAMP = 1743284768
+SHA256 (kyua-0.14.1.tar.gz) = 3caf30a7e316f4f21c32e1c419ec80371fe113e3eed10ba1db9e6efc7ee15ecb
+SIZE (kyua-0.14.1.tar.gz) = 996797
diff --git a/devel/kyua/pkg-plist b/devel/kyua/pkg-plist
index a783be5deb16..2e80601c0541 100644
--- a/devel/kyua/pkg-plist
+++ b/devel/kyua/pkg-plist
@@ -1,193 +1,193 @@
 bin/kyua
 @sample etc/kyua/kyua.conf.sample
 share/man/man1/kyua-about.1.gz
 share/man/man1/kyua-config.1.gz
 share/man/man1/kyua-db-exec.1.gz
 share/man/man1/kyua-db-migrate.1.gz
 share/man/man1/kyua-debug.1.gz
 share/man/man1/kyua-help.1.gz
 share/man/man1/kyua-list.1.gz
 share/man/man1/kyua-report-html.1.gz
 share/man/man1/kyua-report-junit.1.gz
 share/man/man1/kyua-report.1.gz
 share/man/man1/kyua-test.1.gz
 share/man/man1/kyua.1.gz
 share/man/man5/kyua.conf.5.gz
 share/man/man5/kyuafile.5.gz
 %%DATADIR%%/misc/context.html
 %%DATADIR%%/misc/index.html
 %%DATADIR%%/misc/report.css
 %%DATADIR%%/misc/test_result.html
 %%DATADIR%%/store/migrate_v1_v2.sql
 %%DATADIR%%/store/migrate_v2_v3.sql
 %%DATADIR%%/store/schema_v3.sql
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Kyuafile.top
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kyua.conf
 %%TEST%%tests/Kyuafile
 %%TEST%%tests/kyua/Kyuafile
 %%TEST%%tests/kyua/bootstrap/Kyuafile
 %%TEST%%tests/kyua/bootstrap/atf_helpers
 %%TEST%%tests/kyua/bootstrap/plain_helpers
 %%TEST%%tests/kyua/bootstrap/testsuite
 %%TEST%%tests/kyua/cli/Kyuafile
 %%TEST%%tests/kyua/cli/cmd_about_test
 %%TEST%%tests/kyua/cli/cmd_config_test
 %%TEST%%tests/kyua/cli/cmd_db_exec_test
 %%TEST%%tests/kyua/cli/cmd_debug_test
 %%TEST%%tests/kyua/cli/cmd_help_test
 %%TEST%%tests/kyua/cli/cmd_list_test
 %%TEST%%tests/kyua/cli/cmd_test_test
 %%TEST%%tests/kyua/cli/common_test
 %%TEST%%tests/kyua/cli/config_test
 %%TEST%%tests/kyua/cli/main_test
 %%TEST%%tests/kyua/drivers/Kyuafile
 %%TEST%%tests/kyua/drivers/list_tests_helpers
 %%TEST%%tests/kyua/drivers/list_tests_test
 %%TEST%%tests/kyua/drivers/report_junit_test
 %%TEST%%tests/kyua/drivers/scan_results_test
 %%TEST%%tests/kyua/engine/Kyuafile
 %%TEST%%tests/kyua/engine/atf_helpers
 %%TEST%%tests/kyua/engine/atf_list_test
 %%TEST%%tests/kyua/engine/atf_result_test
 %%TEST%%tests/kyua/engine/atf_test
 %%TEST%%tests/kyua/engine/config_test
 %%TEST%%tests/kyua/engine/exceptions_test
 %%TEST%%tests/kyua/engine/filters_test
 %%TEST%%tests/kyua/engine/kyuafile_test
 %%TEST%%tests/kyua/engine/plain_helpers
 %%TEST%%tests/kyua/engine/plain_test
 %%TEST%%tests/kyua/engine/scanner_test
 %%TEST%%tests/kyua/engine/scheduler_test
 %%TEST%%tests/kyua/engine/requirements_test
 %%TEST%%tests/kyua/engine/tap_helpers
 %%TEST%%tests/kyua/engine/tap_parser_test
 %%TEST%%tests/kyua/engine/tap_test
 %%TEST%%tests/kyua/examples/Kyuafile
 %%TEST%%tests/kyua/examples/syntax_test
 %%TEST%%tests/kyua/integration/Kyuafile
 %%TEST%%tests/kyua/integration/cmd_about_test
 %%TEST%%tests/kyua/integration/cmd_config_test
 %%TEST%%tests/kyua/integration/cmd_db_exec_test
 %%TEST%%tests/kyua/integration/cmd_db_migrate_test
 %%TEST%%tests/kyua/integration/cmd_debug_test
 %%TEST%%tests/kyua/integration/cmd_help_test
 %%TEST%%tests/kyua/integration/cmd_list_test
 %%TEST%%tests/kyua/integration/cmd_report_html_test
 %%TEST%%tests/kyua/integration/cmd_report_junit_test
 %%TEST%%tests/kyua/integration/cmd_report_test
 %%TEST%%tests/kyua/integration/cmd_test_test
 %%TEST%%tests/kyua/integration/global_test
 %%TEST%%tests/kyua/integration/helpers/bad_test_program
 %%TEST%%tests/kyua/integration/helpers/bogus_test_cases
 %%TEST%%tests/kyua/integration/helpers/config
 %%TEST%%tests/kyua/integration/helpers/dump_env
 %%TEST%%tests/kyua/integration/helpers/expect_all_pass
 %%TEST%%tests/kyua/integration/helpers/expect_some_fail
 %%TEST%%tests/kyua/integration/helpers/interrupts
 %%TEST%%tests/kyua/integration/helpers/metadata
 %%TEST%%tests/kyua/integration/helpers/race
 %%TEST%%tests/kyua/integration/helpers/simple_all_pass
 %%TEST%%tests/kyua/integration/helpers/simple_some_fail
 %%TEST%%tests/kyua/model/Kyuafile
 %%TEST%%tests/kyua/model/context_test
 %%TEST%%tests/kyua/model/exceptions_test
 %%TEST%%tests/kyua/model/metadata_test
 %%TEST%%tests/kyua/model/test_case_test
 %%TEST%%tests/kyua/model/test_program_test
 %%TEST%%tests/kyua/model/test_result_test
 %%TEST%%tests/kyua/store/Kyuafile
 %%TEST%%tests/kyua/store/dbtypes_test
 %%TEST%%tests/kyua/store/exceptions_test
 %%TEST%%tests/kyua/store/layout_test
 %%TEST%%tests/kyua/store/metadata_test
 %%TEST%%tests/kyua/store/migrate_test
 %%TEST%%tests/kyua/store/read_backend_test
 %%TEST%%tests/kyua/store/read_transaction_test
 %%TEST%%tests/kyua/store/schema_inttest
 %%TEST%%tests/kyua/store/schema_v1.sql
 %%TEST%%tests/kyua/store/schema_v2.sql
 %%TEST%%tests/kyua/store/testdata_v1.sql
 %%TEST%%tests/kyua/store/testdata_v2.sql
 %%TEST%%tests/kyua/store/testdata_v3_1.sql
 %%TEST%%tests/kyua/store/testdata_v3_2.sql
 %%TEST%%tests/kyua/store/testdata_v3_3.sql
 %%TEST%%tests/kyua/store/testdata_v3_4.sql
 %%TEST%%tests/kyua/store/transaction_test
 %%TEST%%tests/kyua/store/write_backend_test
 %%TEST%%tests/kyua/store/write_transaction_test
 %%TEST%%tests/kyua/utils/Kyuafile
 %%TEST%%tests/kyua/utils/auto_array_test
 %%TEST%%tests/kyua/utils/cmdline/Kyuafile
 %%TEST%%tests/kyua/utils/cmdline/base_command_test
 %%TEST%%tests/kyua/utils/cmdline/commands_map_test
 %%TEST%%tests/kyua/utils/cmdline/exceptions_test
 %%TEST%%tests/kyua/utils/cmdline/globals_test
 %%TEST%%tests/kyua/utils/cmdline/options_test
 %%TEST%%tests/kyua/utils/cmdline/parser_test
 %%TEST%%tests/kyua/utils/cmdline/ui_test
 %%TEST%%tests/kyua/utils/config/Kyuafile
 %%TEST%%tests/kyua/utils/config/exceptions_test
 %%TEST%%tests/kyua/utils/config/keys_test
 %%TEST%%tests/kyua/utils/config/lua_module_test
 %%TEST%%tests/kyua/utils/config/nodes_test
 %%TEST%%tests/kyua/utils/config/parser_test
 %%TEST%%tests/kyua/utils/config/tree_test
 %%TEST%%tests/kyua/utils/datetime_test
 %%TEST%%tests/kyua/utils/env_test
 %%TEST%%tests/kyua/utils/format/Kyuafile
 %%TEST%%tests/kyua/utils/format/containers_test
 %%TEST%%tests/kyua/utils/format/exceptions_test
 %%TEST%%tests/kyua/utils/format/formatter_test
 %%TEST%%tests/kyua/utils/fs/Kyuafile
 %%TEST%%tests/kyua/utils/fs/auto_cleaners_test
 %%TEST%%tests/kyua/utils/fs/directory_test
 %%TEST%%tests/kyua/utils/fs/exceptions_test
 %%TEST%%tests/kyua/utils/fs/lua_module_test
 %%TEST%%tests/kyua/utils/fs/operations_test
 %%TEST%%tests/kyua/utils/fs/path_test
 %%TEST%%tests/kyua/utils/logging/Kyuafile
 %%TEST%%tests/kyua/utils/logging/macros_test
 %%TEST%%tests/kyua/utils/logging/operations_test
 %%TEST%%tests/kyua/utils/memory_test
 %%TEST%%tests/kyua/utils/optional_test
 %%TEST%%tests/kyua/utils/passwd_test
 %%TEST%%tests/kyua/utils/process/Kyuafile
 %%TEST%%tests/kyua/utils/process/child_test
 %%TEST%%tests/kyua/utils/process/deadline_killer_test
 %%TEST%%tests/kyua/utils/process/exceptions_test
 %%TEST%%tests/kyua/utils/process/executor_pid_test
 %%TEST%%tests/kyua/utils/process/executor_test
 %%TEST%%tests/kyua/utils/process/fdstream_test
 %%TEST%%tests/kyua/utils/process/helpers
 %%TEST%%tests/kyua/utils/process/isolation_test
 %%TEST%%tests/kyua/utils/process/operations_test
 %%TEST%%tests/kyua/utils/process/status_test
 %%TEST%%tests/kyua/utils/process/systembuf_test
 %%TEST%%tests/kyua/utils/sanity_test
 %%TEST%%tests/kyua/utils/signals/Kyuafile
 %%TEST%%tests/kyua/utils/signals/exceptions_test
 %%TEST%%tests/kyua/utils/signals/interrupts_test
 %%TEST%%tests/kyua/utils/signals/misc_test
 %%TEST%%tests/kyua/utils/signals/programmer_test
 %%TEST%%tests/kyua/utils/signals/timer_test
 %%TEST%%tests/kyua/utils/sqlite/Kyuafile
 %%TEST%%tests/kyua/utils/sqlite/c_gate_test
 %%TEST%%tests/kyua/utils/sqlite/database_test
 %%TEST%%tests/kyua/utils/sqlite/exceptions_test
 %%TEST%%tests/kyua/utils/sqlite/statement_test
 %%TEST%%tests/kyua/utils/sqlite/transaction_test
 %%TEST%%tests/kyua/utils/stacktrace_helper
 %%TEST%%tests/kyua/utils/stacktrace_test
 %%TEST%%tests/kyua/utils/stream_test
 %%TEST%%tests/kyua/utils/text/Kyuafile
 %%TEST%%tests/kyua/utils/text/exceptions_test
 %%TEST%%tests/kyua/utils/text/operations_test
 %%TEST%%tests/kyua/utils/text/regex_test
 %%TEST%%tests/kyua/utils/text/table_test
 %%TEST%%tests/kyua/utils/text/templates_test
 %%TEST%%tests/kyua/utils/units_test