diff --git a/.cvsignore b/.cvsignore
index d58dde7..9585128 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-GConf-2.16.1.tar.bz2
+GConf-2.18.0.1.tar.bz2
diff --git a/GConf-2.18.0.1-reload.patch b/GConf-2.18.0.1-reload.patch
new file mode 100644
index 0000000..871e4fe
--- /dev/null
+++ b/GConf-2.18.0.1-reload.patch
@@ -0,0 +1,11 @@
+--- GConf-2.18.0.1/gconf/gconftool.c.reload	2007-03-02 17:10:13.000000000 -0500
++++ GConf-2.18.0.1/gconf/gconftool.c	2007-03-13 02:21:29.000000000 -0400
+@@ -3780,6 +3780,8 @@
+       ++args;
+     }
+ 
++  g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL); 
++
+   retval |= do_sync (conf);
+   return retval;
+ }
diff --git a/GConf2.spec b/GConf2.spec
index 94cb4bc..ffe0855 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -4,11 +4,11 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.16.1
+Version: 2.18.0.1
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Base
-Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/GConf/2.18/GConf-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 
@@ -24,7 +24,7 @@ BuildRequires: perl(XML::Parser)
 BuildRequires: libtool, autoconf, automake
 BuildRequires: intltool
 
-Patch0: GConf2-2.16.0-reload.patch
+Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=356573
 Patch1: GConf2-2.14.0-timeout.patch
 
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Mar 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.0.1-1
+- Update to 2.18.0.1
+
 * Tue Feb 27 2007 Matthias Clasen <mclasen@redhat.com> - 2.16.1-1
 - Update to 2.16.1
 
diff --git a/sources b/sources
index b352758..942d2b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60d2da294195abb8cac81b6ecceb7e5e  GConf-2.16.1.tar.bz2
+aa0e0a0729fb021bab72b4166fd392f9  GConf-2.18.0.1.tar.bz2