diff --git a/devel/kyua/Makefile b/devel/kyua/Makefile
index bab190f32c06..b3f3b1439b3e 100644
--- a/devel/kyua/Makefile
+++ b/devel/kyua/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	kyua
-PORTVERSION=	0.13
-PORTREVISION=	6
+DISTVERSION=	0.13
+PORTREVISION=	7
 PORTEPOCH=	3
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
-		LOCAL/jmmv
 
 MAINTAINER=	jmmv@FreeBSD.org
 COMMENT=	Testing framework for infrastructure software
 WWW=		https://github.com/jmmv/kyua/
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	liblutok.so:devel/lutok
 
-USES=		lua pkgconfig sqlite
+USES=		autoreconf lua pkgconfig sqlite
+USE_GITHUB=	yes
+GH_ACCOUNT=	freebsd
+GH_TAGNAME=	84c8ec8
 USE_CXXSTD=	gnu++11
 
 GNU_CONFIGURE=	yes
 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
 
 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 26a95a748056..798778e849c3 100644
--- a/devel/kyua/distinfo
+++ b/devel/kyua/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472222340
-SHA256 (kyua-0.13.tar.gz) = db6e5d341d5cf7e49e50aa361243e19087a00ba33742b0855d2685c0b8e721d6
-SIZE (kyua-0.13.tar.gz) = 663776
+TIMESTAMP = 1704159547
+SHA256 (freebsd-kyua-0.13-84c8ec8_GH0.tar.gz) = 3d80730f9bc3ad23fa79cba5fe418c4b0ffc0326101ecce18441c1d18e26198f
+SIZE (freebsd-kyua-0.13-84c8ec8_GH0.tar.gz) = 508997
diff --git a/devel/kyua/files/patch-utils_datetime.cpp b/devel/kyua/files/patch-utils_datetime.cpp
deleted file mode 100644
index 899a1b9ca619..000000000000
--- a/devel/kyua/files/patch-utils_datetime.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- utils/datetime.cpp.orig	2016-08-26 10:09:37 UTC
-+++ utils/datetime.cpp
-@@ -590,11 +590,12 @@ datetime::timestamp::operator-=(const da
- datetime::delta
- datetime::timestamp::operator-(const datetime::timestamp& other) const
- {
--    if ((*this) < other) {
--        throw std::runtime_error(
--            F("Cannot subtract %s from %s as it would result in a negative "
--              "datetime::delta, which are not supported") % other % (*this));
--    }
-+    /*
-+     * XXX-BD: gettimeofday isn't necessicarily monotonic so return the
-+     * smallest non-zero delta if time went backwards.
-+     */
-+    if ((*this) < other)
-+        return datetime::delta::from_microseconds(1);
-     return datetime::delta::from_microseconds(to_microseconds() -
-                                               other.to_microseconds());
- }
diff --git a/devel/kyua/files/patch-utils_datetime__test.cpp b/devel/kyua/files/patch-utils_datetime__test.cpp
deleted file mode 100644
index cf6af9b370f5..000000000000
--- a/devel/kyua/files/patch-utils_datetime__test.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- utils/datetime_test.cpp.orig	2016-08-26 10:09:37 UTC
-+++ utils/datetime_test.cpp
-@@ -532,11 +532,11 @@ ATF_TEST_CASE_BODY(timestamp__subtractio
-     ATF_REQUIRE_EQ(datetime::delta(100, 0), ts3 - ts1);
-     ATF_REQUIRE_EQ(datetime::delta(99, 999988), ts3 - ts2);
- 
--    ATF_REQUIRE_THROW_RE(
--        std::runtime_error,
--        "Cannot subtract 1291970850123456us from 1291970750123468us "
--        ".*negative datetime::delta.*not supported",
--        ts2 - ts3);
-+    /*
-+     * NOTE (ngie): behavior change for
-+     * https://github.com/jmmv/kyua/issues/155 .
-+     */
-+    ATF_REQUIRE_EQ(datetime::delta::from_microseconds(1), ts2 - ts3);
- }
- 
- 
diff --git a/devel/kyua/pkg-plist b/devel/kyua/pkg-plist
index 08ff3dcb0c01..4f1b389980d6 100644
--- a/devel/kyua/pkg-plist
+++ b/devel/kyua/pkg-plist
@@ -1,192 +1,193 @@
 bin/kyua
 @sample etc/kyua/kyua.conf.sample
 man/man1/kyua-about.1.gz
 man/man1/kyua-config.1.gz
 man/man1/kyua-db-exec.1.gz
 man/man1/kyua-db-migrate.1.gz
 man/man1/kyua-debug.1.gz
 man/man1/kyua-help.1.gz
 man/man1/kyua-list.1.gz
 man/man1/kyua-report-html.1.gz
 man/man1/kyua-report-junit.1.gz
 man/man1/kyua-report.1.gz
 man/man1/kyua-test.1.gz
 man/man1/kyua.1.gz
 man/man5/kyua.conf.5.gz
 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
 %%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