diff --git a/.cvsignore b/.cvsignore
index daf8127..c7f1ce3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xosd-2.2.10.tar.bz2
+xosd-2.2.12.tar.bz2
diff --git a/sources b/sources
index aee95d5..7d6315c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a598c1e9f940830d04167c48845758c  xosd-2.2.10.tar.bz2
+756d714cec908e4d4c956ff0e7dcd4c4  xosd-2.2.12.tar.bz2
diff --git a/xosd.spec b/xosd.spec
index 1be55b3..06285ce 100644
--- a/xosd.spec
+++ b/xosd.spec
@@ -1,7 +1,7 @@
 %define	plugdir	%(xmms-config --general-plugin-dir 2>/dev/null)
 
 Name:           xosd
-Version:        2.2.10
+Version:        2.2.12
 Release:        0.fdr.1.2
 Epoch:          0
 Summary:        On-screen display library for X
@@ -9,8 +9,8 @@ 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.10.tar.bz2
-Patch:          %{name}-aclocal18.patch
+Source:         http://www.ignavus.net/xosd-2.2.12.tar.bz2
+Patch0:         %{name}-aclocal18.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel, xmms-devel
@@ -45,14 +45,14 @@ the XOSD library, similarly to TV OSD.
 
 %prep
 %setup -q
-%patch -p0
-chmod -x AUTHORS ChangeLog COPYING README `find src -type f`
+%patch0 -p0
+chmod -x AUTHORS ChangeLog COPYING README TODO `find src -type f`
 
 
 %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
+%configure --disable-gdk_pixbuftest --disable-dependency-tracking
 make %{?_smp_mflags}
 %{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config
 
@@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/osd_cat
 %{_libdir}/*.so.*
 %{_datadir}/xosd
@@ -95,6 +95,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.12-0.fdr.1
+- Update to 2.2.12.
+- Disable dependency tracking to speed up the build.
+- Include TODO in docs.
+
+* Sun Sep 12 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.11-0.fdr.1
+- Update to 2.2.11 (from Debian).
+- While at it, borrow patches from Debian's 2.2.11-2.
+
 * Sat Aug 28 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.10-0.fdr.1
 - Update to 2.2.10.
 - Patch to eliminate aclocal >= 1.8 warnings from libxosd.m4.