diff --git a/sane-backends.spec b/sane-backends.spec
index 01ce209..5e57d02 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -3,25 +3,22 @@
 # gphoto2_split:  ship gphoto2 backend in separate subpackage
 # libs_split:     ship libraries in separate subpackage
 # docs_split:     ship documentation in separate subpackage
-# programs_split: ship programs in separate subpackage
 
 %define gphoto2_support 0%{!?_without_gphoto2:1}
 %define gphoto2_split 0%{!?_without_gphoto2:%{?_with_gphoto2_split:1}}
 
-%if 0%{?fedora} >= 6 || 0%{?redhat} >= 5
+%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
 %define libs_split 0%{?!_without_libs_split:1}
 %define docs_split 0%{?_with_docs_split:1}
-%define programs_split 0%{?_with_programs_split:1}
 %else
 %define libs_split 0%{?_with_libs_split:1}
 %define docs_split 0%{?!_without_docs_split:1}
-%define programs_split 0%{?!_without_programs_split:1}
 %endif
 
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -41,12 +38,6 @@ BuildRequires: gphoto2-devel
 Requires: pam >= 0.78-2
 Requires: udev
 Requires: libsane-hpaio
-%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
-%if ! %{docs_split}
-Obsoletes: sane-backends-docs <= 1.0.17-12
-Provides: sane-backends-docs = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
 ExcludeArch: s390 s390x
 
 %description
@@ -85,6 +76,12 @@ Summary: SANE libraries
 Group: System Environment/Libraries
 Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: sane-backends <= 1.0.17-12
+%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%if ! %{docs_split}
+Obsoletes: sane-backends-docs <= 1.0.17-12
+Provides: sane-backends-docs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 
 %description libs
 This package contains the SANE libraries which are needed by applications that
@@ -102,16 +99,6 @@ want to access digital cameras.
 %endif
 %endif
 
-%if %{programs_split}
-%package programs
-Summary: SANE programs
-Group: Applications/Multimedia
-
-%description programs
-This package contains SANE Utilities and the SANE daemon needed for scanning
-over a network.
-%endif
-
 %prep
 %setup -q
 
@@ -181,47 +168,62 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 %{_datadir}/pixmaps/sane.png
 
+%{_bindir}/sane-find-scanner
+%{_bindir}/scanimage
+%{_sbindir}/*
+
 %if ! %{libs_split}
 %{_libdir}/libsane*.so.*
 %dir %{_libdir}/sane
 %{_libdir}/sane/*.so.*
 %endif
 
-%if %{docs_split}
-%{_docdir}/*
+%if ! %{docs_split} && ! %{libs_split}
+%doc %{_docdir}/*
+%else
+%doc %{_docdir}/*
 %exclude %{_docdir}/%{name}-%{version}/sane-backends.html
 %exclude %{_docdir}/%{name}-%{version}/sane-backends-external.html
 %exclude %{_docdir}/%{name}-%{version}/sane-mfgs.html
 %exclude %{_docdir}/%{name}-%{version}/sane-mfgs-external.html
 %exclude %{_docdir}/%{name}-%{version}/sane.dvi
 %exclude %{_docdir}/%{name}-%{version}/sane.ps
-%else
-%doc %{_docdir}/*
 %endif
 
-%if %{programs_split}
-%exclude %{_mandir}/man1/*
-%exclude %{_mandir}/man8/*
-
-%files programs
+%if %{libs_split}
+%files libs
 %defattr(-, root, root)
-%{_mandir}/man1/sane-find-scanner.1*
-%{_mandir}/man1/scanimage.1*
-%{_mandir}/man8/saned.8*
+%{_libdir}/libsane*.so.*
+%dir %{_libdir}/sane
+%{_libdir}/sane/*.so.*
+
+if ! %{docs_split}
+%doc %{_docdir}/%{name}-%{version}/sane-backends.html
+%doc %{_docdir}/%{name}-%{version}/sane-backends-external.html
+%doc %{_docdir}/%{name}-%{version}/sane-mfgs.html
+%doc %{_docdir}/%{name}-%{version}/sane-mfgs-external.html
+%doc %{_docdir}/%{name}-%{version}/sane.dvi
+%doc %{_docdir}/%{name}-%{version}/sane.ps
+%endif
+
+%if %{gphoto2_split}
+%exclude %{_libdir}/sane/*gphoto2.so.*
+
+%files libs-gphoto2
+%defattr(-, root, root)
+%{_libdir}/sane/*gphoto2.so.*
+%endif
 %endif
-%{_bindir}/sane-find-scanner
-%{_bindir}/scanimage
-%{_sbindir}/*
 
 %if %{docs_split}
 %files docs
 %defattr(-, root, root)
-%{_docdir}/%{name}-%{version}/sane-backends.html
-%{_docdir}/%{name}-%{version}/sane-backends-external.html
-%{_docdir}/%{name}-%{version}/sane-mfgs.html
-%{_docdir}/%{name}-%{version}/sane-mfgs-external.html
-%{_docdir}/%{name}-%{version}/sane.dvi
-%{_docdir}/%{name}-%{version}/sane.ps
+%doc %{_docdir}/%{name}-%{version}/sane-backends.html
+%doc %{_docdir}/%{name}-%{version}/sane-backends-external.html
+%doc %{_docdir}/%{name}-%{version}/sane-mfgs.html
+%doc %{_docdir}/%{name}-%{version}/sane-mfgs-external.html
+%doc %{_docdir}/%{name}-%{version}/sane.dvi
+%doc %{_docdir}/%{name}-%{version}/sane.ps
 %endif
 
 %files devel
@@ -234,22 +236,11 @@ rm -rf %{buildroot}
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/sane-backends.pc
 
-%if %{libs_split}
-%files libs
-%defattr(-, root, root)
-%{_libdir}/libsane*.so.*
-%dir %{_libdir}/sane
-%{_libdir}/sane/*.so.*
-%if %{gphoto2_split}
-%exclude %{_libdir}/sane/*gphoto2.so.*
-
-%files libs-gphoto2
-%defattr(-, root, root)
-%{_libdir}/sane/*gphoto2.so.*
-%endif
-%endif
-
 %changelog
+* Fri Sep 08 2006 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-2
+- remove unneeded programs subpackage
+- clean up docs vs. libs pkg split, mark documentation as %%doc
+
 * Mon Jul 24 2006 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-1
 - version 1.0.18
 - unify spec file between OS releases