diff --git a/libp11.spec b/libp11.spec
index 5749aca..a795fd8 100644
--- a/libp11.spec
+++ b/libp11.spec
@@ -3,14 +3,16 @@ Version:        0.2.7
 Release:        2%{?dist}
 Summary:        Library for using PKCS#11 modules
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensc-project.org/libp11
-Source0:        http://www.opensc-project.org/files/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://www.opensc-project.org/files/libp11/libp11-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen graphviz
-BuildRequires:  openssl-devel pkgconfig libtool-ltdl-devel
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
 
 %description
 Libp11 is a library implementing a small layer on top of PKCS#11 API to
@@ -19,11 +21,11 @@ make using PKCS#11 implementations easier.
 %package devel
 Summary:        Files for developing with %{name}
 Group:          Development/Libraries
-Requires:       libp11 = %{version}-%{release}
-License:        LGPLv2+
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
-Files for developing with %{name}
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
@@ -41,6 +43,9 @@ mkdir __docdir
 mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/api/ __docdir/
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/
 
+# Remove libtool .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -55,15 +60,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples __docdir/api
-%exclude %{_libdir}/*.la
+%doc examples/ __docdir/api/
 %{_libdir}/libp11.so
-%{_libdir}/pkgconfig/*
-%{_includedir}/*
-
+%{_libdir}/pkgconfig/libp11.pc
+%{_includedir}/libp11.h
 
 %changelog
 * Sun Jul 04 2010 Kalev Lember <kalev@smartlink.ee> - 0.2.7-2
+- Spec file cleanup
 - Don't install html docs with main library package
 - Removed R: pkgconfig from -devel as it is now automatically added