diff --git a/libwpd.spec b/libwpd.spec
index 8ec62d8..24054e0 100644
--- a/libwpd.spec
+++ b/libwpd.spec
@@ -1,3 +1,6 @@
+%global apiversion 0.9
+%global streamname %{name}-stream
+
 Name: libwpd
 Summary: Library for reading and converting WordPerfect documents
 Version: 0.9.7
@@ -54,16 +57,21 @@ LD_LIBRARY_PATH=../lib/.libs make check
 
 %files
 %doc COPYING.LGPL COPYING.MPL CREDITS README
-%{_libdir}/*.so.*
+%{_libdir}/%{name}-%{apiversion}.so.*
+%{_libdir}/%{streamname}-%{apiversion}.so.*
 
 %files tools
-%{_bindir}/wpd2*
+%{_bindir}/wpd2html
+%{_bindir}/wpd2raw
+%{_bindir}/wpd2text
 
 %files devel
 %doc HACKING TODO
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
-%{_includedir}/libwpd-0.9
+%{_libdir}/%{name}-%{apiversion}.so
+%{_libdir}/%{streamname}-%{apiversion}.so
+%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
+%{_libdir}/pkgconfig/%{streamname}-%{apiversion}.pc
+%{_includedir}/%{name}-%{apiversion}
 
 %changelog
 * Sun Apr 21 2013 David Tardon <dtardon@redhat.com> - 0.9.7-1