diff --git a/.cvsignore b/.cvsignore
index f8abacb..ba852ee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libpst-0.6.34.tar.gz
+libpst-0.6.36.tar.gz
diff --git a/libpst.spec b/libpst.spec
index 55f8673..b3c66c5 100644
--- a/libpst.spec
+++ b/libpst.spec
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.34
+Version:            0.6.36
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -8,9 +8,9 @@ Source:             http://www.five-ten-sg.com/%{name}/packages/%{name}-%{versio
 BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL:                http://www.five-ten-sg.com/%{name}/
 Requires:           ImageMagick
+Requires:           %{name}-libs = %{version}-%{release}
 BuildRequires:      ImageMagick freetype-devel gd-devel libjpeg-devel zlib-devel
 
-
 %description
 The Libpst utilities include readpst which can convert email messages
 to both mbox and MH mailbox formats, pst2ldif which can convert the
@@ -19,34 +19,120 @@ which can convert email messages to the DII load file format used by
 Summation.
 
 
+%package libs
+Summary:            Shared library used by the pst utilities
+Group:              Development/Libraries
+
+%description libs
+The libpst-libs package contains the shared library used by the pst
+utilities.
+
+
+%package devel
+Summary:            Library links and header files for libpst application development
+Group:              Development/Libraries
+Requires:           pkgconfig
+Requires:           %{name}-libs = %{version}-%{release}
+
+%description devel
+The libpst-devel package contains the library links and header files
+you'll need to develop applications using the libpst shared library.
+You do not need to install it if you just want to use the libpst
+utilities.
+
+
+%package devel-doc
+Summary:            Documentation for libpst.so for libpst application development
+Group:              Documentation
+Requires:           %{name}-doc = %{version}-%{release}
+
+%description devel-doc
+The libpst-devel-doc package contains the doxygen generated
+documentation for the libpst.so shared library.
+
+
+%package doc
+Summary:            Documentation for the pst utilities in html format
+Group:              Documentation
+
+%description doc
+The libpst-doc package contains the html documentation for the pst
+utilities.  You do not need to install it if you just want to use the
+libpst utilities.
+
+
+
 %prep
 %setup -q
 
 
 %build
-%configure
+%configure --enable-libpst-shared
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT%{_libdir}/libpst.la
+rm $RPM_BUILD_ROOT%{_libdir}/libpst.a
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post libs -p /sbin/ldconfig
+
+
+%postun libs -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%docdir %{_datadir}/doc/%{name}-%{version}
-%{_datadir}/doc/%{name}-%{version}
+
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libpst.so.*
+
+
+%files devel-doc
+%defattr(-,root,root,-)
+%{_datadir}/doc/%{name}-%{version}/devel/
+
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libpst.so
+%{_includedir}/%{name}-2/
+%{_libdir}/pkgconfig/libpst.pc
+
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{_datadir}/doc/%{name}-%{version}/
+%{_datadir}/doc/%{name}-%{version}/*.html
+%{_datadir}/doc/%{name}-%{version}/*.pdf
+%{_datadir}/doc/%{name}-%{version}/AUTHORS
+%{_datadir}/doc/%{name}-%{version}/COPYING
+%{_datadir}/doc/%{name}-%{version}/ChangeLog
+%{_datadir}/doc/%{name}-%{version}/NEWS
+%{_datadir}/doc/%{name}-%{version}/README
 
 
 %changelog
+* Tue Apr 14 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.36-1
+- build separate -doc and -devel-doc subpackages.
+- other spec file cleanup
+
+* Wed Apr 08 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.35-1
+- properly add trailing mime boundary in all modes.
+- build separate libpst, libpst-libs, libpst-devel rpms.
+
 * Thu Mar 19 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.34-1
 - avoid putting mixed item types into the same output folder.
 
diff --git a/sources b/sources
index 8b58ba6..c7b2714 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-092067121a7f8c5f8bea8b3cdc31f5e6  libpst-0.6.34.tar.gz
+97244ec839cc208c6ce647a1ef3f99eb  libpst-0.6.36.tar.gz