diff --git a/srcpkgs/atf-devel b/srcpkgs/atf-devel
new file mode 120000
index 00000000000..b1ba95f61b2
--- /dev/null
+++ b/srcpkgs/atf-devel
@@ -0,0 +1 @@
+atf
\ No newline at end of file
diff --git a/srcpkgs/atf/atf-devel.template b/srcpkgs/atf/atf-devel.template
new file mode 100644
index 00000000000..e6c2bb68b25
--- /dev/null
+++ b/srcpkgs/atf/atf-devel.template
@@ -0,0 +1,14 @@
+# Template file for 'atf-devel'.
+#
+short_desc="${short_desc} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run atf
+
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
+}
diff --git a/srcpkgs/atf/template b/srcpkgs/atf/template
index f9f1c149b7e..dcf3457f0c6 100644
--- a/srcpkgs/atf/template
+++ b/srcpkgs/atf/template
@@ -1,14 +1,13 @@
 # Template file for 'atf'
 pkgname=atf
-version=0.13
-distfiles="http://ftp.netbsd.org/pub/NetBSD/misc/jmmv/atf/0.13/atf-$version.tar.gz"
+version=0.15
+distfiles="https://kyua.googlecode.com/files/atf-$version.tar.gz"
 build_style=gnu-configure
-revision=1
 short_desc="Automated Testing Framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.netbsd.org/~jmmv/atf/"
-license="Simplified BSD"
-checksum=fbdcddb6fd7b346643ef0d7a5d446e1d3110174e2625fb0c29b1470331c385ec
+license="BSD"
+checksum=0c7242a107c7e308feed8fac45a194a6f6c8d90283add576cfc3dab0fcd61b2b
 long_desc="
  The Automated Testing Framework (ATF) is a collection of libraries and
  utilities designed to ease unattended application testing in the hands
@@ -26,10 +25,8 @@ long_desc="
  be able to certify that a given piece of software works on their machine
  as advertised."
 
-pre_configure()
-{
-	# GRRR!
-	sed -i -e "s|\-Werror||g" configure
-}
+subpackages="atf-devel"
+xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd"
 
 Add_dependency full gdb
+Add_dependency full xmlcatmgr