diff --git a/libpfm.spec b/libpfm.spec
index 9471f8d..a6b6906 100644
--- a/libpfm.spec
+++ b/libpfm.spec
@@ -1,14 +1,11 @@
-%define DATE 080731
-%define libpfm_release 1
-Summary: A performance monitoring library for Linux/ia64
+Summary: A performance monitoring library for Linux
 Name: libpfm
 Version: 3.5
-Release: %{libpfm_release}%{?dist}
-License: MIT-style
+Release: 2%{?dist}
+License: MIT
 Group: Development/Libraries
 ExclusiveArch: ia64 %{ix86} x86_64 ppc ppc64
 ExclusiveOS: linux
-AutoReqProv: no
 Source: http://prdownloads.sourceforge.net/perfmon2/%{name}-%{version}.tar.gz
 URL: http://sourceforge.net/projects/perfmon2/
 
@@ -28,6 +25,7 @@ various processors.
 %package devel
 Summary: the Linux performance library (libpfm) development files.
 Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The performance monitoring library (libpfm) is used to develop 
@@ -52,26 +50,31 @@ make	PREFIX=/usr DESTDIR=%{buildroot} LIBDIR=%{_libdir}
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
 make install  PREFIX=/usr DESTDIR=%{buildroot} LIBDIR=%{_libdir}
+# If we need this static library, make a -static subpackage for it.
+rm -rf %{buildroot}/%{_libdir}/*.a
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
+
 %clean
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
-%doc README
-%attr(755,root,root) %{_libdir}/*.so*
-%{_libdir}/*.so*
+%defattr(-,root,root,-)
+%doc README COPYRIGHT
+%attr(755,root,root) %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
-%doc README
-%doc %{_mandir}/man3/*
-%{_libdir}/libpfm.a
-%{_prefix}/include/*
+%defattr(-,root,root,-)
+%{_mandir}/man3/*
+%{_libdir}/libpfm.so
+%{_includedir}/*
 
 %changelog
+* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 3.5-2
+- fix license tag
+- package cleanups (drop static library, package shared bits correctly)
+
 * Thu Jul 31 2008 Will Cohen <wcohen@redhat.com> - 3.5-1
 - Update to libpfm-3.5.