diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 1bf58b7..49a8eed 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -20,8 +20,8 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.4.1.1
-Release: 1
-License: GPL
+Release: 2
+License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
 #Patch1: evolution-data-server-1.0.2-fix-64-bit-build.patch
@@ -189,6 +189,8 @@ make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
 # remove libtool archives for importers and the like
 find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec rm {} \;
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*.a
 
 %find_lang %{name}-%{eds_base_version}
 
@@ -210,7 +212,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/evolution-data-server-%{eds_base_version}
 %{_datadir}/idl/evolution-data-server-%{eds_api_version}
 %{_datadir}/pixmaps/evolution-data-server-%{eds_base_version}
-%{_libdir}/evolution-data-server-%{eds_api_version}
+%dir %{_libdir}/evolution-data-server-%{eds_api_version}
+%dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/
+%dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions/
+%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.so
+%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.urls
+%{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -221,6 +228,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 10 2005 David Malcolm <dmalcolm@redhat.com> - 1.4.1.1-2
+- Updated license field to reflect change from GPL to LGPL
+- Remove all static libraries, not just those in /usr/lib; avoid listing libdir
+  subdirectory so that we can be more explicit about the package payload (bug
+  #172882)
+
 * Mon Oct 17 2005 David Malcolm <dmalcolm@redhat.com> - 1.4.1.1-1
 - 1.4.1.1