diff --git a/sane.spec b/sane.spec
index 2a87d2f..16cb3c6 100644
--- a/sane.spec
+++ b/sane.spec
@@ -371,6 +371,12 @@ cd primaxscan*
 rm -f %{buildroot}%{_libdir}/libsane-primax.a %{buildroot}%{_prefix}/lib/sane/libsane-primax.a
 cp primax_scan %{buildroot}%{_bindir}
 cd ..
+
+%ifarch x86_64
+mv -f %{buildroot}%{_prefix}/lib/sane/libsane-primax.* %{buildroot}%{_libdir}/sane/
+rm -rf %{buildroot}%{_prefix}/lib/sane/
+%endif
+
 %endif
 
 # Epson Avasys driver for Epson scanners
@@ -420,43 +426,40 @@ sed -i '/^%dir/d' sane-backends.lang
 %_postun_groupdel scanner
 
 %files backends -f sane-backends.lang
-doc %{_docdir}/sane-backends-%{version}
+%doc %{_docdir}/sane-backends-%{version}
 %{_bindir}/sane-find-scanner
 %{_bindir}/scanimage
 %{_bindir}/gamma4scanimage
-%if %{primax_support}
+%if %{with primax}
 %{_bindir}/primax_scan
 %endif
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man7/*
 %dir %{_sysconfdir}/sane.d
-%dir %{_sysconfdir}/sane.d/dll.d
 #config(noreplace) %{_sysconfdir}/sane.d/*[^saned]
 %config(noreplace) %{_sysconfdir}/sane.d/*
 /lib/udev/rules.d/*-libsane.rules
 %attr(1777,root,root) %dir /var/lib/lock/sane
-%if %{epkowa_support}
+%if %{with epkowa}
 # iscan files
 %exclude %{_sysconfdir}/sane.d/epkowa.conf
 %exclude %{_mandir}/man5/sane-epkowa.5*
 %endif
 
 %if %{with epkowa}
-#-f iscan.lang
-%files backends-iscan 
+%files backends-iscan
 %{_libdir}/sane/libsane-epkowa.*
 %{_sysconfdir}/sane.d/epkowa.conf
 %{_mandir}/man5/sane-epkowa.5*
-%dir %{_datadir}/iscan
-%{_datadir}/iscan/*
+%{_mandir}/man8/iscan-registry.*
 %endif
 
 %files backends-doc
 %doc %{_docdir}/sane-backends-doc-%{version}
 
 %files -n %{libname}
-%{_libdir}/*.so.%{major}*
+%{_libdir}/*.so.*
 %dir %{_libdir}/sane
 %{_libdir}/sane/*.so.*
 %if %{with epkowa}
@@ -467,8 +470,8 @@ doc %{_docdir}/sane-backends-%{version}
 %{_bindir}/sane-config
 %{_libdir}/*.so
 %{_libdir}/sane/*.so
-%{_libdir}/pkgconfig/*.pc
 %{_includedir}/sane
+%{_libdir}/pkgconfig/sane-backends.pc
 %if %{with epkowa}
 %exclude %{_libdir}/sane/libsane-epkowa*
 %endif