diff --git a/sane-backends.spec b/sane-backends.spec
index bf98e19..987e532 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -1,13 +1,27 @@
-# Disable gphoto2 backend by using "--without gphoto2"
-%define gphoto2_support 0%{!?_without_gphoto2:1}
+# --with/--without options:
+# gphoto2:        support gphoto2 backend
+# 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
 
-# Enable splitting out gphoto2 backends by using "--with gphoto2_split"
+%define gphoto2_support 0%{!?_without_gphoto2:1}
 %define gphoto2_split 0%{!?_without_gphoto2:%{?_with_gphoto2_split:1}}
 
+%if 0%{?fedora} >= 6 || 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.17
-Release: 13.1
+Version: 1.0.18
+Release: 1%{?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
@@ -28,8 +42,12 @@ 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
+Provides: sane-backends-docs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 ExcludeArch: s390 s390x
 
 %description
@@ -53,6 +71,16 @@ Provides: sane-devel
 This package contains static libraries and header files for writing Scanner
 Access Now Easy (SANE) modules.
 
+%if %{docs_split}
+%package docs
+Summary: Additional documentation for SANE
+Group: Documentation
+
+%description docs
+Additional documentation for SANE, a universal scanner interface.
+%endif
+
+%if %{libs_split}
 %package libs
 Summary: SANE libraries
 Group: System Environment/Libraries
@@ -73,7 +101,9 @@ Requires: sane-backends-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 This package contains the SANE libraries which are needed by applications that
 want to access digital cameras.
 %endif
+%endif
 
+%if %{programs_split}
 %package programs
 Summary: SANE programs
 Group: Applications/Multimedia
@@ -81,6 +111,7 @@ Group: Applications/Multimedia
 %description programs
 This package contains SANE Utilities and the SANE daemon needed for scanning
 over a network.
+%endif
 
 %prep
 %setup -q
@@ -138,9 +169,13 @@ sed 's|MODE="660", GROUP="scanner"|SYMLINK+="scanner-%k"|g' libsane.rules > %{bu
 %clean
 rm -rf %{buildroot}
 
+%if %{libs_split}
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
+%else
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%endif
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -148,10 +183,50 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/sane.d/*
 %{_sysconfdir}/udev/rules.d/*
 %{_mandir}/*/*
+%{_datadir}/pixmaps/sane.png
+
+%if ! %{libs_split}
+%{_libdir}/libsane*.so.*
+%dir %{_libdir}/sane
+%{_libdir}/sane/*.so.*
+%endif
+
+%if %{docs_split}
+%{_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/*
-%{_datadir}/pixmaps/sane.png
-%doc %{_docdir}/*
+
+%files programs
+%defattr(-, root, root)
+%{_mandir}/man1/sane-find-scanner.1*
+%{_mandir}/man1/scanimage.1*
+%{_mandir}/man8/saned.8*
+%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
+%endif
 
 %files devel
 %defattr(-,root,root)
@@ -163,6 +238,7 @@ rm -rf %{buildroot}
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/sane-backends.pc
 
+%if %{libs_split}
 %files libs
 %defattr(-, root, root)
 %{_libdir}/libsane*.so.*
@@ -175,18 +251,14 @@ rm -rf %{buildroot}
 %defattr(-, root, root)
 %{_libdir}/sane/*gphoto2.so.*
 %endif
-
-%files programs
-%defattr(-, root, root)
-%{_bindir}/sane-find-scanner
-%{_bindir}/scanimage
-%{_mandir}/man1/sane-find-scanner.1*
-%{_mandir}/man1/scanimage.1*
-%{_sbindir}/*
-%{_mandir}/man8/saned.8*
+%endif
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 24 2006 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-1
+- version 1.0.18
+- unify spec file between OS releases
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.0.17-13.1
 - rebuild
 
 * Fri Jun 09 2006 Nils Philippsen <nphilipp@redhat.com> 1.0.17-13