diff --git a/bind.spec b/bind.spec
index 259f4a8..9f817cc 100644
--- a/bind.spec
+++ b/bind.spec
@@ -11,7 +11,6 @@
 ## The order of libs is important. See lib/Makefile.in for details
 %define bind_export_libs isc dns isccfg irs
 %{!?_export_dir:%global _export_dir /bind9-export/}
-%{!?_export_includedir:%global _export_includedir %{_includedir}/bind9-export}
 
 %{?!SDB:       %global SDB       1}
 %{?!unittest:  %global unittest  1}
@@ -263,7 +262,7 @@ Group:    Applications/System
 BuildArch:noarch
 %if 0%{?fedora} >= 1
 Obsoletes: bind99-license < 9.9.11-3
-Provides:  bind99-license
+Provides:  bind99-license = 9.9.11-3
 %endif
 
 %description license
@@ -407,7 +406,7 @@ Group:     System Environment/Libraries
 Requires:  bind-license = %{epoch}:%{version}-%{release}
 %if 0%{?fedora} >= 1
 Obsoletes: bind99-libs < 9.9.11-3
-Provides:  bind99-libs
+Provides:  bind99-libs = 9.9.11-3
 %endif
 
 %description export-libs
@@ -421,7 +420,7 @@ Group:    Development/Libraries
 Requires: %{name}-export-libs%{?_isa} = %{epoch}:%{version}-%{release}
 %if 0%{?fedora} >= 1
 Obsoletes: bind99-libs-devel < 9.9.11-3
-Provides:  bind99-libs-devel
+Provides:  bind99-libs-devel = 9.9.11-3
 %endif
 
 %description export-devel
@@ -629,19 +628,19 @@ export LIBDIR_SUFFIX
         --libdir=%{_libdir}%{_export_dir} \
         --includedir=%{_includedir}%{_export_dir}/ \
         --disable-threads \
-	--with-gssapi=yes \
-	--disable-isc-spnego \
-	--enable-fixed-rrset \
+        --with-gssapi=yes \
+        --disable-isc-spnego \
+        --enable-fixed-rrset \
 %if %{unittest}
-	--with-atf=/usr \
+        --with-atf=/usr \
 %endif
-	--disable-rpz-nsip \
-	--disable-rpz-nsdname \
-	--without-lmdb \
-	--without-libxml2 \
-	--without-libjson \
-	--without-zlib \
-	--without-dlopen \
+        --disable-rpz-nsip \
+        --disable-rpz-nsdname \
+        --without-lmdb \
+        --without-libxml2 \
+        --without-libjson \
+        --without-zlib \
+        --without-dlopen \
         --enable-full-report
 
 ## We don't want to build other libs than -export twice
@@ -659,9 +658,9 @@ lib/Makefile
 for lib in %{bind_export_libs}
 do
         find .  -name Makefile -exec sed  "s/lib${lib}\./lib${lib}-export\./g" -i {} \;
-	sed -e "s/-l${lib}\([^[:alpha:]]\)/-l${lib}-export\1/g" \
-	    -e "s/lib${lib}\./lib${lib}-export\./g" \
-	    -i isc-config.sh
+        sed -e "s/-l${lib}\([^[:alpha:]]\)/-l${lib}-export\1/g" \
+            -e "s/lib${lib}\./lib${lib}-export\./g" \
+            -i isc-config.sh
 done;
 %{__patch} -p2 -b --suffix .export-isc-config < %{PATCH135}
 make %{?_smp_mflags}
@@ -671,7 +670,7 @@ popd
 %unit_prepare_build export-libs
 # Do not try pkcs11 in export libs
 sed -e '/^\s*include(.*-pkcs11/ d' -e '/^\s*include(.*lwres/ d' \
-	-i export-libs/lib/Kyuafile
+        -i export-libs/lib/Kyuafile
 
 ## End of export libs
 %endif
@@ -784,8 +783,6 @@ popd
 
 %if %{with_export_libs}
 pushd export-libs
-## -lirs-export -ldns-export -lisccfg-export -lisc-export
-## install -d -m 0755  ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-export/
 make DESTDIR=${RPM_BUILD_ROOT} install
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ld.so.conf.d
 echo "%{_libdir}/%{_export_dir}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf
@@ -1405,6 +1402,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
 * Wed Feb 07 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.2-11.P1
+- Use versioned provides
 - Fix starting of unit tests
 - Forward export libs path to isc-config
 - Rename export devel subpackage to bind-export-devel