diff --git a/.cvsignore b/.cvsignore
index e69de29..2d364e4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+xosd-2.2.5.tar.gz
diff --git a/sources b/sources
index e69de29..f720513 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+96bae6f0800c1710d7d4edb3b37b01e5  xosd-2.2.5.tar.gz
diff --git a/xosd.spec b/xosd.spec
new file mode 100644
index 0000000..137e446
--- /dev/null
+++ b/xosd.spec
@@ -0,0 +1,160 @@
+%define	plugdir	%(xmms-config --general-plugin-dir)
+
+Name:           xosd
+Version:        2.2.5
+Release:        0.fdr.1.rh80
+Epoch:          0
+Summary:        On-screen display library for X
+
+Group:          System Environment/Libraries
+License:        GPL
+URL:            http://www.ignavus.net/software.html
+Source:         http://www.ignavus.net/xosd-2.2.5.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel, xmms-devel
+
+%description
+XOSD displays text on your screen, sounds simple right? The difference
+is it is unmanaged and shaped, so it appears transparent. This gives
+the effect of an On Screen Display, like your TV/VCR etc.. The package
+also includes an xmms plugin, which automatically displays various
+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} = %{epoch}:%{version}-%{release}, XFree86-devel
+
+%description    devel
+The xosd-devel package contains static libraries, header files and
+documentation for developing applications that use the XOSD on-screen
+display.
+
+%package     -n xmms-%{name}
+Summary:        An XMMS plugin for on-screen display using the XOSD library
+Group:          Applications/Multimedia
+Requires:       %{name} = %{epoch}:%{version}-%{release}, xmms
+Obsoletes:      %{name}-xmms
+
+%description -n xmms-%{name}
+An X MultiMedia System plugin to display information on-screen through
+the XOSD library, similarly to TV OSD.
+
+
+%prep
+%setup -q
+
+
+%build
+# XOSD 2.2.1+ says it requires gdk-pixbuf >= 0.22.0, but it seems to work
+# fine with older (0.18.0) versions.  This is needed for the XMMS plugin.
+%configure --disable-gdk_pixbuftest
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT{%{_libdir},%{plugdir}}/*.la
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/osd_cat
+%{_libdir}/*.so.*
+%{_datadir}/xosd
+%{_mandir}/man1/osd_cat*
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/xosd-config
+%{_includedir}/*
+%{_libdir}/*.a
+%{_libdir}/*.so
+%{_datadir}/aclocal/*
+%{_mandir}/man1/xosd-config*
+%{_mandir}/man3/*
+
+%files -n xmms-%{name}
+%defattr(-,root,root,-)
+%{plugdir}/*.so
+
+
+%changelog
+* Sat Sep 27 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.5-0.fdr.1
+- Update to 2.2.5.
+
+* Mon Jun 30 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.2-0.fdr.1
+- Update to 2.2.2.
+
+* Sat Apr 19 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.1-0.fdr.1
+- Update to 2.2.1.
+- Disable gdk-pixbuf test, XOSD says it requires >= 0.22.0, but 0.18.0
+  seems to work just fine.
+
+* Sun Apr 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.0-0.fdr.1
+- Update to 2.2.0.
+- Rename XMMS plugin package to xmms-xosd, and obsolete xosd-xmms.
+
+* Mon Apr  7 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.1.3-0.fdr.3
+- Require XFree86-devel in -devel (xosd-config --libs).
+
+* Sat Apr  5 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.1.3-0.fdr.2
+- Add epoch to devel and xmms Requires (#30 comment 4).
+- Don't include *.la in xmms package.
+- Save .spec in UTF-8.
+
+* Sat Mar 22 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.1.3-0.fdr.1
+- Update to 2.1.3 and current Fedora guidelines.
+- Don't include %%{_libdir}/*.la.
+
+* Wed Feb 26 2003 Ville Skyttä <ville.skytta at iki.fi> - 2.1.2-1.fedora.1
+- Update to 2.1.2.
+- Use %%post(un) -p /sbin/ldconfig.
+
+* Sat Feb  8 2003 Ville Skyttä <ville.skytta at iki.fi> - 2.1.0-1.fedora.1
+- First Fedora release, based on Matthias Saou's work.
+
+* Wed Feb  5 2003 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 2.1.0.
+- Spec file updates to reflect upstream changes.
+
+* Wed Jan  8 2003 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 2.0.1.
+
+* Mon Oct 21 2002 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 1.1.1.
+
+* Sun Sep 29 2002 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 1.0.4.
+- Rebuilt for Red Hat Linux 8.0.
+
+* Fri Aug 30 2002 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 1.0.3.
+
+* Wed Aug 28 2002 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 1.0.2.
+- Fixed %%defattr for xmms plugin sub-package.
+
+* Mon Jul 22 2002 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 1.0.0.
+- Spec file cleanup (near rewrite), added devel and xmms sub-packages.
+
+* Wed Aug  1 2001 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Update to 0.7.0 and spec file cleanup.
+- Changed the plugin path.
+- Added ldconfig execution since I also changed the lib filename.
+
+* Sat Feb  3 2001 Matthias Saou <matthias.saou@est.une.marmotte.net>
+- Initial RPM release.
+