diff --git a/.cvsignore b/.cvsignore
index 4209639..6733289 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-GConf-2.2.0.tar.bz2
+GConf-2.4.0.tar.bz2
diff --git a/GConf2.spec b/GConf2.spec
index 2ef741b..189cfe5 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -1,11 +1,11 @@
 %define libxml2_version 2.4.12
-%define orbit2_version 2.6.0    
+%define orbit2_version 2.8.0    
 %define glib2_version 2.2.0
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.2.0
-Release: 2
+Version: 2.4.0
+Release: 1
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -18,15 +18,7 @@ BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk-doc >= 0.9
 BuildRequires: pkgconfig >= 0.14
-BuildRequires: libtool
-
-## this is the original unlock-dialog-only patch
-Patch1: gconf-1.2.1-unlock-dialog.patch
-## this is what we're using now, with GCONF_LOCAL_LOCKS
-## if it breaks, back down to patch1
-Patch2: gconf-2.1.90-locks.patch
-#### in CVS we have gconf-2.3.0-locks.patch which is the final patch in CVS
-#### with linc_get_tmpdir()
+BuildRequires: libtool, autoconf
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -48,18 +40,21 @@ development using GConf.
 %prep
 %setup -q -n GConf-%{version}
 
-#%patch1 -p0 -b .unlock-dialog
-%patch2 -p1 -b .locks
+# work around glib-gettextize bug affecting tarball
+perl -pi -e 's/-lintl//g' aclocal.m4
 
 ## unpack pofiles
 ## tar zxf %{SOURCE2}
 
 %build
-%configure
+autoconf # needed for the aclocal.m4 hack above
+%configure --disable-gtk-doc
+export tagname=CC
 make LIBTOOL=/usr/bin/libtool  ## %{?_smp_mflags}
 
 %install
 rm -fr $RPM_BUILD_ROOT
+export tagname=CC
 %makeinstall LIBTOOL=/usr/bin/libtool
 
 chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/gconf.xml.defaults
@@ -102,6 +97,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep  9 2003 Alexander Larsson <alexl@redhat.com> 2.4.0-1
+- 2.4.0
+
+* Thu Aug  7 2003 Jonathan Blandford <jrb@redhat.com>
+- begin the move to GNOME-2.4
+- locking patch appears to be upstream.  Removing.
+
+* Tue Aug  5 2003 Elliot Lee <sopwith@redhat.com> 2.2.1-3
+- Fix libtool
+
+* Mon Jul 14 2003 Havoc Pennington <hp@redhat.com>
+- automated rebuild
+
+* Mon Jul  7 2003 Havoc Pennington <hp@redhat.com> 2.2.1-1
+- upgrade to 2.2.1
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
 * Tue Apr  8 2003 Matt Wilson <msw@redhat.com> 2.2.0-2
 - use system libtool (#88338)
 
diff --git a/sources b/sources
index aaefee5..fe852ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07ed2f6c583d5664cd728787cf59219b  GConf-2.2.0.tar.bz2
+202a2c7f8cab2e1a39b4407a067a1ad7  GConf-2.4.0.tar.bz2