diff --git a/bind.spec b/bind.spec
index 0dab73c..1ddeb0a 100644
--- a/bind.spec
+++ b/bind.spec
@@ -579,8 +579,7 @@ popd
 %endif
 
 %if %{with DLZ}
-  pushd contrib/dlz
-  pushd modules
+  pushd contrib/dlz/modules
   for DIR in mysql mysqldyn; do
     sed -e 's/@DLZ_DRIVER_MYSQL_INCLUDES@/$(shell mysql_config --cflags)/' \
         -e 's/@DLZ_DRIVER_MYSQL_LIBS@/$(shell mysql_config --libs)/' \
@@ -590,7 +589,6 @@ popd
     make -C $DIR CFLAGS="-fPIC -I../include $CFLAGS $LDFLAGS"
   done
   popd
-  popd
 %endif
 popd # build
 
@@ -711,15 +709,13 @@ install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
 
 %if %{with DLZ}
   pushd build
-  pushd contrib/dlz
-  pushd modules
+  pushd contrib/dlz/modules
   for DIR in filesystem ldap mysql mysqldyn sqlite3; do
-    make -C $DIR DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/bind install
+    make -C $DIR DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/named install
   done
   mv mysqldyn/testing/README mysqldyn/testing/README.testing
   popd
   popd
-  popd
 %endif
 
 # Install isc/errno2result.h header
@@ -938,8 +934,10 @@ fi;
 
 %files
 # TODO: Move from lib/bind to lib/named, as used by upstream
-%{_libdir}/bind
-%{_libdir}/named
+%dir %{_libdir}/bind
+%dir %{_libdir}/named
+%{_libdir}/named/*.so
+%exclude %{_libdir}/named/dlz_*.so
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named
 %config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.root.key
 %{_tmpfilesdir}/named.conf