diff --git a/srcpkgs/atf/atf-devel.template b/srcpkgs/atf/atf-devel.template
index cf85dabdea..d8445750df 100644
--- a/srcpkgs/atf/atf-devel.template
+++ b/srcpkgs/atf/atf-devel.template
@@ -2,9 +2,6 @@
 #
 depends="atf-libs>=$version"
 short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/atf/atf-libs.template b/srcpkgs/atf/atf-libs.template
index 13ba352af5..76e46410e1 100644
--- a/srcpkgs/atf/atf-libs.template
+++ b/srcpkgs/atf/atf-libs.template
@@ -1,9 +1,6 @@
 # Template file for 'atf-libs'.
 #
 short_desc="${short_desc} - runtime libraries"
-long_desc="${long_desc}
-
- This package contains the shared runtime libraries."
 
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
diff --git a/srcpkgs/atf/template b/srcpkgs/atf/template
index 7fb9706c8e..7b8d65d1a5 100644
--- a/srcpkgs/atf/template
+++ b/srcpkgs/atf/template
@@ -1,6 +1,6 @@
 # Template file for 'atf'
 pkgname=atf
-version=0.16
+version=0.17
 revision=1
 build_style=gnu-configure
 subpackages="atf-libs atf-devel"
@@ -11,20 +11,16 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.netbsd.org/~jmmv/atf/"
 license="BSD"
 distfiles="https://kyua.googlecode.com/files/atf-$version.tar.gz"
-checksum=f33a85f4a0677f40be406baaf6a5a749ca02870af9707f7606a0f3fa613c8339
-long_desc="
- The Automated Testing Framework (ATF) is a collection of libraries and
- utilities designed to ease unattended application testing in the hands
- of developers and end users of a specific piece of software.
+checksum=4458bc6d1ebbbaffd86cd71a426760ff4083eca87f388d9498cd1972ecf258cc
 
- As regards developers, ATF provides the necessary means to easily create
- test suites composed of multiple test programs, which in turn are a
- collection of test cases. It also attempts to simplify the debugging of
- problems when these test cases detect an error by providing as much
- information as possible about the failure.
-
- As regards users, it simplifies the process of running the test suites
- and, in special, encourages end users to run them often: they do not need
- to have source trees around nor any other development tools installed to
- be able to certify that a given piece of software works on their machine
- as advertised."
+if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	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"
+	makedepends="automake"
+	pre_configure() {
+		autoreconf -fi
+	}
+fi