diff --git a/cdparanoia.spec b/cdparanoia.spec
index 00e0ef4..5b66dfd 100644
--- a/cdparanoia.spec
+++ b/cdparanoia.spec
@@ -1,17 +1,19 @@
 %define ver	9.8
 %define realver	alpha%{ver}
 
-Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
 Name: cdparanoia
 Version: %{realver}
-Release: 2
+Release: 6
 License: GPL
 Group: Applications/Multimedia
 Source: http://www.xiph.org/paranoia/download/%{name}-III-%{realver}.src.tgz 
 Url: http://www.xiph.org/paranoia/index.html
 BuildRoot: %{_tmppath}/cdparanoia-%{version}-root
+Requires: cdparanoia-libs = %{version}-%{release}
+Obsoletes: cdparanoia-III
+Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
 
-%description
+%description 
 Cdparanoia (Paranoia III) reads digital audio directly from a CD, then
 writes the data to a file or pipe in WAV, AIFC or raw 16 bit linear
 PCM format.  Cdparanoia doesn't contain any extra features (like the ones
@@ -21,62 +23,97 @@ drives prone to misalignment, frame jitter and loss of streaming during
 atomic reads.  Cdparanoia is also good at reading and repairing data from
 damaged CDs.
 
-%package devel
+%package -n cdparanoia-devel
 Summary: Development tools for libcdda_paranoia (Paranoia III).
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: cdparanoia-libs = %{version}-%{release}
+Obsoletes: cdparanoia-devel
 
-%description devel
+%description -n cdparanoia-devel
 The cdparanoia-devel package contains the static libraries and header
 files needed for developing applications to read CD Digital Audio disks.
 
+%package -n cdparanoia-libs
+Summary: Libraries for libcdda_paranoia (Paranoia III).
+Group: Development/Libraries
+
+%description -n cdparanoia-libs
+The cdparanoia-libs package contains the dynamic libraries needed for
+applications which read CD Digital Audio disks.
+
 %prep
 %setup -q -n %{name}-III-%{realver}
 
 %build
 rm -rf $RPM_BUILD_ROOT
-%configure
+%configure --includedir=%{_includedir}/cdda
 make  
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_includedir}
+install -d $RPM_BUILD_ROOT%{_includedir}/cdda
 install -d $RPM_BUILD_ROOT%{_libdir}
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 install -m 0755 -s cdparanoia $RPM_BUILD_ROOT%{_bindir}
 install -m 0644 cdparanoia.1 $RPM_BUILD_ROOT%{_mandir}/man1/ 
-install -m 0644 paranoia/cdda_paranoia.h $RPM_BUILD_ROOT%{_includedir}
+install -m 0644 utils.h paranoia/cdda_paranoia.h interface/cdda_interface.h \
+	$RPM_BUILD_ROOT%{_includedir}/cdda
 install -m 0755 paranoia/libcdda_paranoia.so.0.%{ver} \
+	interface/libcdda_interface.so.0.%{ver} \
 	$RPM_BUILD_ROOT%{_libdir}
-install -m 0755 paranoia/libcdda_paranoia.a $RPM_BUILD_ROOT%{_libdir}
-install -m 0644 interface/cdda_interface.h $RPM_BUILD_ROOT%{_includedir}
-install -m 0755 interface/libcdda_interface.so.0.%{ver} \
+install -m 0755 paranoia/libcdda_paranoia.a interface/libcdda_interface.a \
 	$RPM_BUILD_ROOT%{_libdir}
-install -m 0755 interface/libcdda_interface.a $RPM_BUILD_ROOT%{_libdir}
 
-%post -p /sbin/ldconfig
+pushd $RPM_BUILD_ROOT%{_libdir}
+ln -s libcdda_paranoia.so.0.%{ver} libcdda_paranoia.so
+ln -s libcdda_interface.so.0.%{ver} libcdda_interface.so
+popd
 
-%postun -p /sbin/ldconfig
+%post -n cdparanoia-libs
+/sbin/ldconfig
+
+%postun -n cdparanoia-libs
+if [ "$1" -ge "1" ]; then
+  /sbin/ldconfig
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -n cdparanoia
 %defattr(-,root,root)
 %doc README GPL FAQ.txt
 %{_bindir}/*
 %{_mandir}/man1/*
-%{_libdir}/libcdda_paranoia.so.*
-%{_libdir}/libcdda_interface.so.*
 
-%files devel
+%files -n cdparanoia-libs
 %defattr(-,root,root)
-%{_includedir}/*
+%{_libdir}/*.so*
+
+%files -n cdparanoia-devel
+%defattr(-,root,root)
+%{_includedir}/cdda/*
 %{_libdir}/*.a
 
 %changelog
+* Thu Dec  6 2001 Peter Jones <pjones@redhat.com> alpha9.8-6
+- move includes to %{_includedir}/cdda/
+- add utils.h to %install
+- clean up %install some.
+
+* Sun Nov  4 2001 Peter Jones <pjones@redhat.com> alpha9.8-5
+- make a -libs package which contains the .so files
+- make the cdparanoia dependancy towards that, not -devel
+
+* Thu Aug  2 2001 Peter Jones <pjones@redhat.com>
+- bump the release not to conflict with on in the RH build tree :/
+- reverse devel dependency
+
+* Wed Aug  1 2001 Peter Jones <pjones@redhat.com>
+- fix %post and %postun to only run ldconfig for devel packages
+
 * Wed Jul 18 2001 Crutcher Dunnavant <crutcher@redhat.com>
 - devel now depends on package
 
diff --git a/sources b/sources
index 3a8ad5e..bd4bf02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba3739765d60fc29274cabe055b00cad  cdparanoia-III-alpha9.8.src.tgz
+9e97f4e4609338a1056d36457a082eb4  cdparanoia-III-alpha9.8.src.tgz