diff --git a/.cvsignore b/.cvsignore
index 0406aed..8479517 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-1.5.5.tar.bz2
+evolution-data-server-1.5.90.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 5a890ee..a737e06 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -24,7 +24,7 @@
 
 Summary: Backend data server for evolution
 Name: evolution-data-server
-Version: 1.5.5
+Version: 1.5.90
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -203,7 +203,7 @@ autoconf
   --enable-file-locking=fcntl --enable-dot-locking=no \
   %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
 export tagname=CC
-make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
+make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -228,8 +228,18 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}-%{eds_base_version}.lang
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog NEWS AUTHORS
-%{_libdir}/bonobo/servers/*
-%{_libdir}/*.so.*
+%{_libdir}/bonobo/servers/GNOME_Evolution_DataServer_%{eds_api_version}.server
+%{_libdir}/libcamel-%{eds_api_version}.so.*
+%{_libdir}/libcamel-provider-%{eds_api_version}.so.*
+%{_libdir}/libebook-%{eds_api_version}.so.*
+%{_libdir}/libecal-%{eds_api_version}.so.*
+%{_libdir}/libedata-book-%{eds_api_version}.so.*
+%{_libdir}/libedata-cal-%{eds_api_version}.so.*
+%{_libdir}/libedataserver-%{eds_api_version}.so.*
+%{_libdir}/libedataserverui-%{eds_api_version}.so.*
+%{_libdir}/libegroupwise-%{eds_api_version}.so.*
+%{_libdir}/libexchange-storage-%{eds_api_version}.so.*
+
 %{_libexecdir}/evolution-data-server-%{eds_base_version}
 %{_libexecdir}/camel-index-control-%{eds_api_version}
 %{_libexecdir}/camel-lock-helper-%{eds_api_version}
@@ -286,11 +296,35 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_includedir}/evolution-data-server-%{eds_base_version}
 %{_datadir}/gtk-doc/html/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/libcamel-%{eds_api_version}.so
+%{_libdir}/libcamel-provider-%{eds_api_version}.so
+%{_libdir}/libebook-%{eds_api_version}.so
+%{_libdir}/libecal-%{eds_api_version}.so
+%{_libdir}/libedata-book-%{eds_api_version}.so
+%{_libdir}/libedata-cal-%{eds_api_version}.so
+%{_libdir}/libedataserver-%{eds_api_version}.so
+%{_libdir}/libedataserverui-%{eds_api_version}.so
+%{_libdir}/libegroupwise-%{eds_api_version}.so
+%{_libdir}/libexchange-storage-%{eds_api_version}.so
+%{_libdir}/pkgconfig/camel-%{eds_api_version}.pc
+%{_libdir}/pkgconfig/camel-provider-%{eds_api_version}.pc
+%{_libdir}/pkgconfig/evolution-data-server-%{eds_api_version}.pc
+%{_libdir}/pkgconfig/libebook-%{eds_api_version}.pc
+%{_libdir}/pkgconfig/libecal-%{eds_api_version}.pc
+%{_libdir}/pkgconfig/libedata-book-%{eds_api_version}.pc
+%{_libdir}/pkgconfig/libedata-cal-%{eds_api_version}.pc
+%{_libdir}/pkgconfig/libedataserver-%{eds_api_version}.pc
+%{_libdir}/pkgconfig/libedataserverui-%{eds_api_version}.pc
+%{_libdir}/pkgconfig/libegroupwise-%{eds_api_version}.pc
+%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 
 %changelog
+* Mon Jan 30 2006 David Malcolm <dmalcolm@redhat.com> - 1.5.90-1
+- 1.5.90
+- explicitly list various files rather than rely on globbing
+- enabled parallel make
+
 * Wed Jan 25 2006 David Malcolm <dmalcolm@redhat.com> - 1.5.5-1
 - 1.5.5
 - added CalDAV backend to the list of packaged extensions
diff --git a/sources b/sources
index 321ed8e..c2f860c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9104c52697ccccfa55c039b9547effbd  evolution-data-server-1.5.5.tar.bz2
+bdbf8608530d4f294b179b7c0de47d1b  evolution-data-server-1.5.90.tar.bz2