diff --git a/libxklavier.spec b/libxklavier.spec
index 4638ef1..5a65b0c 100644
--- a/libxklavier.spec
+++ b/libxklavier.spec
@@ -5,7 +5,6 @@ Release: 	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
-BuildRequires: doxygen
 BuildRequires: libxml2-devel
 BuildRequires: libxkbfile-devel
 BuildRequires: libX11-devel
@@ -39,8 +38,13 @@ needed to develop libxklavier applications.
 
 %build
 
-%configure --disable-doxygen --with-xkb-base='%{_datadir}/X11/xkb' --with-xkb-bin-base='%{_bindir}'
-make
+%configure \
+  --disable-static \
+  --with-xkb-base='%{_datadir}/X11/xkb' \
+  --with-xkb-bin-base='%{_bindir}'
+
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,17 +64,21 @@ rm -rf %{buildroot}
 %defattr(-, root, root)
 
 %doc AUTHORS NEWS README COPYING.LIB
-%{_libdir}/lib*.so.*
+%{_libdir}/libxklavier.so.15*
 
 %files devel
 %defattr(-, root, root)
 
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.so
-%{_includedir}/*
+%{_libdir}/pkgconfig/libxklavier.pc
+%{_libdir}/libxklavier.so
+%{_includedir}/libxklavier/
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Wed Jul 01 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.0-2
+- %%files: track files closer, esp lib sonames
+- %%build: drop --disable-doxygen, add --disable-static, add %%{?_smp_mflags}
+
 * Tue Jun 30 2009 Matthias Clasen <mclasen@redhat.com> - 4.0-1
 - Update to 4.0