diff --git a/.cvsignore b/.cvsignore
index 9d7cf59..1d1b8fc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-GConf-2.23.2.tar.bz2
+GConf-2.24.0.tar.bz2
diff --git a/GConf2.spec b/GConf2.spec
index 07bdf82..2e3829c 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -6,7 +6,7 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.23.2
+Version: 2.24.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
@@ -33,8 +33,6 @@ Requires: dbus
 Requires: /usr/bin/killall
 
 Patch0: GConf-2.18.0.1-reload.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=356573
-Patch1: GConf2-2.14.0-timeout.patch
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -70,7 +68,6 @@ which require GTK+.
 %prep
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
-%patch1 -p1 -b .timers  
 
 %build
 %configure --disable-static --enable-defaults-service
@@ -140,6 +137,10 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 22 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.0-1
+- Update to 2.24.0
+- Drop obsolete timeout patch
+
 * Fri Aug 22 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.2-1
 - Update to 2.23.2
 - Drop upstreamed patches
diff --git a/sources b/sources
index f6ecb69..2ae436a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e43e125e4ee84205d5e9215d91c3229d  GConf-2.23.2.tar.bz2
+4971d96f5ba94fe4a69396267bd5afe8  GConf-2.24.0.tar.bz2