diff --git a/common/shlibs b/common/shlibs
index 66db1c2eb1..c82e4a5823 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -979,3 +979,5 @@ libORBit-imodule-2.so.0 libORBit2-2.14.19_1
 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
 libminiupnpc.so.8 miniupnpc-1.6_1
 libxbps.so.0 libxbps-0.16.3_2
+libatf-c.so.0 atf-libs-0.16_1
+libatf-c++.so.0 atf-libs-0.16_1
diff --git a/srcpkgs/atf-libs b/srcpkgs/atf-libs
new file mode 120000
index 0000000000..b1ba95f61b
--- /dev/null
+++ b/srcpkgs/atf-libs
@@ -0,0 +1 @@
+atf
\ No newline at end of file
diff --git a/srcpkgs/atf/atf-devel.template b/srcpkgs/atf/atf-devel.template
index a14f67b259..cf85dabdea 100644
--- a/srcpkgs/atf/atf-devel.template
+++ b/srcpkgs/atf/atf-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'atf-devel'.
 #
-depends="atf"
+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
 	vmove "usr/lib/*.a" usr/lib
diff --git a/srcpkgs/atf/atf-libs.rshlibs b/srcpkgs/atf/atf-libs.rshlibs
new file mode 100644
index 0000000000..d2b712aef4
--- /dev/null
+++ b/srcpkgs/atf/atf-libs.rshlibs
@@ -0,0 +1,4 @@
+libstdc++.so.6
+libm.so.6
+libc.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/atf/atf-libs.template b/srcpkgs/atf/atf-libs.template
new file mode 100644
index 0000000000..13ba352af5
--- /dev/null
+++ b/srcpkgs/atf/atf-libs.template
@@ -0,0 +1,10 @@
+# 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/atf.rshlibs b/srcpkgs/atf/atf.rshlibs
index 1e93591372..737edb1c0f 100644
--- a/srcpkgs/atf/atf.rshlibs
+++ b/srcpkgs/atf/atf.rshlibs
@@ -1,3 +1,5 @@
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
+libatf-c++.so.0
+libatf-c.so.0
diff --git a/srcpkgs/atf/template b/srcpkgs/atf/template
index 5a26c511b1..7fb9706c8e 100644
--- a/srcpkgs/atf/template
+++ b/srcpkgs/atf/template
@@ -1,15 +1,17 @@
 # Template file for 'atf'
 pkgname=atf
-version=0.15
-revision=3
-distfiles="https://kyua.googlecode.com/files/atf-$version.tar.gz"
+version=0.16
+revision=1
 build_style=gnu-configure
+subpackages="atf-libs atf-devel"
+xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd"
 fulldepends="gdb xmlcatmgr"
 short_desc="Automated Testing Framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.netbsd.org/~jmmv/atf/"
 license="BSD"
-checksum=0c7242a107c7e308feed8fac45a194a6f6c8d90283add576cfc3dab0fcd61b2b
+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
@@ -26,7 +28,3 @@ long_desc="
  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."
-
-subpackages="atf-devel"
-xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd"
-