diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 42fb675..738e5a6 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -214,8 +214,9 @@ 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-1.2/camel-providers/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/camel-providers/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/addressbook-backends/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/calendar-backends/*.a
 
 # give the libraries some executable bits 
 find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
@@ -304,7 +305,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/evolution-data-server
+%{_includedir}/evolution-data-server-%{eds_base_version}
 %{_libdir}/libcamel-1.2.so
 %{_libdir}/libcamel-provider-1.2.so
 %{_libdir}/libebackend-1.2.so