diff --git a/xosd.spec b/xosd.spec
index 416c809..084cee2 100644
--- a/xosd.spec
+++ b/xosd.spec
@@ -1,9 +1,11 @@
+%bcond_with static
+
 %define	xmms_plugdir %(xmms-config --general-plugin-dir 2>/dev/null)
 %define bmp_plugdir %(pkg-config bmp --variable=general_plugin_dir 2>/dev/null)
 
 Name:           xosd
 Version:        2.2.14
-Release:        3
+Release:        4%{?dist}
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
@@ -14,7 +16,14 @@ Patch0:         %{name}-aclocal18.patch
 Patch1:         %{name}-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel >= 1:0.22.0, xmms-devel
+# Needed for main xosd:
+BuildRequires:  libX11-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXinerama-devel
+# ...and for the bmp and xmms plugins:
+BuildRequires:  gtk+-devel >= 1:1.2.2
+BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
+BuildRequires:  xmms-devel
 BuildRequires:  bmp-devel
 
 %description
@@ -27,7 +36,10 @@ interesting things as they change (song name, volume etc...)
 %package        devel
 Summary:        Development files for the XOSD on-screen display library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, XFree86-devel
+Requires:       %{name} = %{version}-%{release}
+Requires:       libX11-devel
+Requires:       libXext-devel
+Requires:       libXinerama-devel
 
 %description    devel
 The xosd-devel package contains static libraries, header files and
@@ -37,7 +49,8 @@ display.
 %package     -n xmms-%{name}
 Summary:        XMMS plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}, xmms
+Requires:       %{name} = %{version}-%{release}
+Requires:       xmms
 Obsoletes:      %{name}-xmms <= 2.2.12
 
 %description -n xmms-%{name}
@@ -47,7 +60,8 @@ the XOSD library, similarly to TV OSD.
 %package     -n bmp-%{name}
 Summary:        BMP plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}, bmp
+Requires:       %{name} = %{version}-%{release}
+Requires:       bmp
 
 %description -n bmp-%{name}
 Beep Media Player plugin to display information on-screen through
@@ -61,7 +75,7 @@ the XOSD library, similarly to TV OSD.
 
 
 %build
-%configure --disable-dependency-tracking
+%configure --disable-dependency-tracking %{!?with_static:--disable-static}
 make %{?_smp_mflags}
 %{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config
 
@@ -77,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
@@ -84,30 +99,37 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/osd_cat
-%{_libdir}/*.so.*
-%{_datadir}/xosd
-%{_mandir}/man1/osd_cat*
+%{_libdir}/libxosd.so.*
+%{_datadir}/xosd/
+%{_mandir}/man1/osd_cat.1*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/xosd-config
-%{_includedir}/*
-%{_libdir}/*.a
-%{_libdir}/*.so
+%{_includedir}/xosd.h
+%{_libdir}/libxosd.so
+%if %{with static}
+%{_libdir}/libxosd.a
+%endif
 %{_datadir}/aclocal/libxosd.m4
-%{_mandir}/man1/xosd-config*
-%{_mandir}/man3/*
+%{_mandir}/man1/xosd-config.1*
+%{_mandir}/man3/xosd*.3*
 
 %files -n xmms-%{name}
 %defattr(-,root,root,-)
-%{xmms_plugdir}/*.so
+%{xmms_plugdir}/libxmms_osd.so
 
 %files -n bmp-%{name}
 %defattr(-,root,root,-)
-%{bmp_plugdir}/*.so
+%{bmp_plugdir}/libbmp_osd.so
 
 
 %changelog
+* Thu Nov 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2.14-4
+- Adapt to modular X packaging.
+- Don't ship static libraries by default.
+- Specfile cleanups.
+
 * Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2.14-3
 - Rebuild.