diff --git a/srcpkgs/atf/template b/srcpkgs/atf/template
index f931ecddf87..08ce3469bf0 100644
--- a/srcpkgs/atf/template
+++ b/srcpkgs/atf/template
@@ -1,27 +1,28 @@
 # Template file for 'atf'
 pkgname=atf
-version=0.21
-revision=4
+version=0.23
+revision=1
 build_style=gnu-configure
-hostmakedepends="gdb"
+configure_args="
+ kyua_cv_getopt_plus=yes
+ kyua_cv_attribute_noreturn=yes
+ kyua_cv_getcwd_works=yes"
 depends="gdb xmlcatmgr"
+checkdepends="kyua"
 xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd"
 short_desc="Automated Testing Framework"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="https://github.com/jmmv/atf"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+homepage="https://github.com/freebsd/atf"
 license="BSD-2-Clause"
-distfiles="https://github.com/jmmv/atf/releases/download/atf-${version}/atf-${version}.tar.gz"
-checksum=92bc64180135eea8fe84c91c9f894e678767764f6dbc8482021d4dde09857505
+distfiles="https://github.com/freebsd/atf/releases/download/atf-${version}/atf-${version}.tar.gz"
+checksum=a64e2427d021297f25b3f2e1798f8ec4dc3061ffb01a1cd3f66cc4cee486b10f
 
-configure_args="kyua_cv_attribute_noreturn=yes
-		kyua_cv_getcwd_works=yes
-		kyua_cv_getopt_optreset=no
-		kyua_cv_getopt_plus=yes
-		kyua_cv_signal_lastno=31"
+post_check() {
+	kyua test
+}
 
 post_install() {
-	sed '/^$/q' < atf-c.h > LICENSE
-	vlicense LICENSE
+	vlicense COPYING
 }
 
 atf-devel_package() {
@@ -35,6 +36,7 @@ atf-devel_package() {
 		vmove usr/share/aclocal
 	}
 }
+
 atf-libs_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {