diff --git a/netresolve.spec b/netresolve.spec
index 7cc7891..67ee8d1 100644
--- a/netresolve.spec
+++ b/netresolve.spec
@@ -1,21 +1,80 @@
-%define snapshot_suffix .20140422git
+%define snapshot_suffix .20150917git
 
 Name: netresolve
 Version: 0.0.1
-Release: 0.3%{?snapshot_suffix}%{?dist}
+Release: 0.5%{?snapshot_suffix}%{?dist}
 Summary: Generic name resolution library
 Group: System Environment/Libraries
 License: BSD
 URL: https://sourceware.org/netresolve/
 Source0: netresolve-0.0.1.tar.xz
-BuildRequires: unbound-devel pkgconfig(libcares)
+BuildRequires: ldns-devel
+BuildRequires: pkgconfig(libcares)
+BuildRequires: unbound-devel
+BuildRequires: pkgconfig(avahi-client)
+BuildRequires: pkgconfig(libasyncns)
+# live builds
+BuildRequires: autoconf automake libtool
+# tests
+BuildRequires: valgrind
+#
+Requires: netresolve-core netresolve-tools netresolve-compat netresolve-backends-compat netresolve-backends-aresdns netresolve-backends-avahi
 %description
-Netresolve is a package for nonblocking network name resolution via backends
+Netresolve is a package for non-blocking network name resolution via backends
 intended as a replacement for name service switch based name resolution in
-glibc.
+glibc as well as a testbed for future glibc improvements.
+
+%package core
+Summary: Core netresolve libraries
+Group: Development/Libraries
+%description core
+This package provides core netresolve library with basic name resolution
+capabilities to tools and application.
+
+%package compat
+Summary: Compatibility netresolve libraries and tools
+Group: Development/Libraries
+%description compat
+This package provides libraries and tools for using netresolve from applications
+built against other name resolution libraries.
+
+%package tools
+Summary: Command line tools based on core netresolve libraries
+Group: Development/Libraries
+%description tools
+This package provides tools that provide netresolve capabilities using the
+command line.
+
+%package backends-compat
+Summary: Backends for netresolve using existing tools
+Group: Development/Libraries
+%description backends-compat
+This package provides backends for querying libc, glibc nsswitch backends,
+asyncns and other existing name resolution libraries.
+
+%package backends-aresdns
+Summary: DNS backend for netresolve based on aresdns
+Group: Development/Libraries
+%description backends-aresdns
+This package provides DNS capabilities including learning DNSSEC validity
+from the AD flag for netresolve using c-ares.
+
+%package backends-avahi
+Summary: Multicast DNS backend for netresolve based on libavahi
+Group: Development/Libraries
+%description backends-avahi
+This package provides Multicast DNS capabilities using Avahi daemon and
+libraries.
+
+%package backends-ubdns
+Summary: DNS backend for netresolve based on libunbound
+Group: Development/Libraries
+%description backends-ubdns
+This package provides DNS capabilities including DNSSEC validation to
+netresolve using libunbound.
 
 %package devel
-Summary: Development files for getdns
+Summary: Development files for netresolve
 Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
@@ -24,6 +83,13 @@ applications or shared objects that use netresolve.
 
 %prep
 %setup -q
+NOCONFIGURE=yes ./autogen.sh
+
+# disable some tests for now
+sed -i \
+    -e '/999999x/d' \
+    -e '/x-x-x-x-x-x-x-x-x/d' \
+    tests/test-netresolve.sh
 
 %build
 %configure \
@@ -34,50 +100,94 @@ make %{?_smp_mflags}
 %make_install
 find %{buildroot} -name '*.la' -delete
 
-# The tests don't work well during the build process, yet
-#%check
-#make check
+%check
+export NETRESOLVE_TEST_COMMAND="libtool execute valgrind --leak-check=full --error-exitcode=1 ./netresolve"
+make check || { cat ./test-suite.log; false; }
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
+
+%files core
 %doc README TODO NEWS COPYING
-%{_bindir}/netconnect
-%{_bindir}/netresolve
 %{_libdir}/libnetresolve-backend-any.so.0
 %{_libdir}/libnetresolve-backend-any.so.0.0.0
-%{_libdir}/libnetresolve-backend-aresdns.so.0
-%{_libdir}/libnetresolve-backend-aresdns.so.0.0.0
 %{_libdir}/libnetresolve-backend-exec.so.0
 %{_libdir}/libnetresolve-backend-exec.so.0.0.0
-%{_libdir}/libnetresolve-backend-getaddrinfo.so.0
-%{_libdir}/libnetresolve-backend-getaddrinfo.so.0.0.0
+%{_libdir}/libnetresolve-backend-hostname.so.0
+%{_libdir}/libnetresolve-backend-hostname.so.0.0.0
 %{_libdir}/libnetresolve-backend-hosts.so.0
 %{_libdir}/libnetresolve-backend-hosts.so.0.0.0
 %{_libdir}/libnetresolve-backend-loopback.so.0
 %{_libdir}/libnetresolve-backend-loopback.so.0.0.0
-%{_libdir}/libnetresolve-backend-nss.so.0
-%{_libdir}/libnetresolve-backend-nss.so.0.0.0
 %{_libdir}/libnetresolve-backend-numerichost.so.0
 %{_libdir}/libnetresolve-backend-numerichost.so.0.0.0
-%{_libdir}/libnetresolve-backend-ubdns.so.0
-%{_libdir}/libnetresolve-backend-ubdns.so.0.0.0
 %{_libdir}/libnetresolve-backend-unix.so.0
 %{_libdir}/libnetresolve-backend-unix.so.0.0.0
-%{_libdir}/libnetresolve-libc.so.0
-%{_libdir}/libnetresolve-libc.so.0.0.0
 %{_libdir}/libnetresolve.so.0
 %{_libdir}/libnetresolve.so.0.0.0
+%{_libdir}/libnss_netresolve.so.2
+%{_libdir}/libnss_netresolve.so.2.0.0
+
+%files tools
+%{_bindir}/getaddrinfo
+%{_bindir}/gethostbyaddr
+%{_bindir}/gethostbyname
+%{_bindir}/getnameinfo
+%{_bindir}/netresolve
+%{_bindir}/res_query
+
+%files compat
+%{_bindir}/wrapresolve
+%{_libdir}/libnetresolve-asyncns.so.0
+%{_libdir}/libnetresolve-asyncns.so.0.0.0
+%{_libdir}/libnetresolve-libc.so.0
+%{_libdir}/libnetresolve-libc.so.0.0.0
+
+%files backends-compat
+%{_libdir}/libnetresolve-backend-asyncns.so.0
+%{_libdir}/libnetresolve-backend-asyncns.so.0.0.0
+%{_libdir}/libnetresolve-backend-libc.so.0
+%{_libdir}/libnetresolve-backend-libc.so.0.0.0
+%{_libdir}/libnetresolve-backend-nss.so.0
+%{_libdir}/libnetresolve-backend-nss.so.0.0.0
+
+%files backends-aresdns
+%{_libdir}/libnetresolve-backend-aresdns.so.0
+%{_libdir}/libnetresolve-backend-aresdns.so.0.0.0
+
+%files backends-avahi
+%{_libdir}/libnetresolve-backend-avahi.so.0
+%{_libdir}/libnetresolve-backend-avahi.so.0.0.0
+
+%files backends-ubdns
+%{_libdir}/libnetresolve-backend-ubdns.so.0
+%{_libdir}/libnetresolve-backend-ubdns.so.0.0.0
 
 %files devel
-%{_includedir}/netresolve-utils.h
+%{_includedir}/netresolve-epoll.h
+%{_includedir}/netresolve-epoll.h
+%{_includedir}/netresolve-event.h
+%{_includedir}/netresolve-event.h
+%{_includedir}/netresolve-glib.h
+%{_includedir}/netresolve-glib.h
+%{_includedir}/netresolve-nonblock.h
+%{_includedir}/netresolve-nonblock.h
+%{_includedir}/netresolve-select.h
+%{_includedir}/netresolve-select.h
 %{_includedir}/netresolve.h
+%{_libdir}/libnetresolve-asyncns.so
 %{_libdir}/libnetresolve-backend-any.so
 %{_libdir}/libnetresolve-backend-aresdns.so
+%{_libdir}/libnetresolve-backend-asyncns.so
+%{_libdir}/libnetresolve-backend-avahi.so
+%{_libdir}/libnetresolve-backend-avahi.so
 %{_libdir}/libnetresolve-backend-exec.so
-%{_libdir}/libnetresolve-backend-getaddrinfo.so
+%{_libdir}/libnetresolve-backend-hostname.so
 %{_libdir}/libnetresolve-backend-hosts.so
+%{_libdir}/libnetresolve-backend-libc.so
+%{_libdir}/libnetresolve-backend-libc.so
 %{_libdir}/libnetresolve-backend-loopback.so
 %{_libdir}/libnetresolve-backend-nss.so
 %{_libdir}/libnetresolve-backend-numerichost.so
@@ -85,8 +195,15 @@ find %{buildroot} -name '*.la' -delete
 %{_libdir}/libnetresolve-backend-unix.so
 %{_libdir}/libnetresolve-libc.so
 %{_libdir}/libnetresolve.so
+%{_libdir}/libnss_netresolve.so
 
 %changelog
+* Thu Sep 17 2015 Pavel Šimerda <psimerda@redhat.com> - 0.0.1-0.5.20150917git
+- lots of changes in upstream since the last time
+
+* Sun Nov 02 2014 Pavel Šimerda <psimerda@redhat.com> - 0.0.1-0.4.20141102git
+- rebuilt
+
 * Wed May 21 2014 Pavel Šimerda <psimerda@redhat.com> - 0.0.1-0.3.20140422git
 - avoid running the tests
 
diff --git a/sources b/sources
deleted file mode 100644
index eb51bed..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-eb0bc9a7bc742416b2d4a8feec52a9a9  netresolve-0.0.1.tar.xz