diff --git a/quagga.spec b/quagga.spec
index ce404bc..e88751e 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -32,7 +32,7 @@
 Summary:    Routing daemon
 Name:		quagga
 Version:	0.99.16
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:	GPLv2+
 Group:      System Environment/Daemons
 Source0:    http://www.quagga.net/download/%{name}-%{version}.tar.gz
@@ -91,7 +91,7 @@ Contributed/3rd party tools which may be of use with quagga.
 %package devel
 Summary: Header and object files for quagga development
 Group: System Environment/Daemons
-Provides: %{name}-static = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The quagga-devel package contains the header and object files necessary for
@@ -198,6 +198,9 @@ install -m644 %{zeb_rh_src}/quagga.pam $RPM_BUILD_ROOT/etc/pam.d/quagga
 install -m644 %{zeb_rh_src}/quagga.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/quagga
 install -d -m770  $RPM_BUILD_ROOT/var/run/quagga
 
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %pre
 # add vty_group
 %if %vty_group
@@ -332,7 +335,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %endif
 %dir %{_libdir}
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
 # noreplace not used due to smaple conf files
 %config /etc/quagga/[!v]*
 %attr(755,root,root) /etc/rc.d/init.d/*
@@ -345,13 +348,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files contrib
 %defattr(-,root,root)
-%doc %attr(0644,root,root) tools
+%doc AUTHORS COPYING %attr(0644,root,root) tools
 
 %files devel
 %defattr(-,root,root)
+%doc AUTHORS COPYING
 %dir %{_libdir}
-%{_libdir}/*.a
-%{_libdir}/*.la
+%{_libdir}/*.so
 %dir %{_includedir}/quagga
 %{_includedir}/quagga/*.h
 %dir %{_includedir}/quagga/ospfd
@@ -362,6 +365,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jul 12 2010 Jiri Skala <jskala@redhat.com> - 0.99.16-4
+- added license text to subpackages
+- fixes #609931 - quagga : does not adhere to Static Library Packaging Guidelines
+
 * Thu Jul 01 2010 Jiri Skala <jskala@redhat.com> - 0.99.16-3
 - fixes #609616 - does not adhere to Static Library Packaging Guidelines