diff --git a/.cvsignore b/.cvsignore
index a1d6868..a1123e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-GConf-2.5.90.tar.bz2
+GConf-2.6.0.tar.bz2
diff --git a/GConf2.spec b/GConf2.spec
index 62c0b26..1b0ca21 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -4,8 +4,8 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.5.90
-Release: 1.1
+Version: 2.6.0
+Release: 4
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -13,12 +13,21 @@ Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.ta
 BuildRoot: %{_tmppath}/GConf2-%{version}-root
 URL: http://www.gnome.org
 Prereq: /sbin/install-info
+# Bug #106283
+Requires: ORBit2 >= 2.8.0
+
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gtk2-devel
 BuildRequires: gtk-doc >= 0.9
 BuildRequires: pkgconfig >= 0.14
 BuildRequires: libtool, autoconf
+BuildRequires: gettext
+
+## Will all be in 2.6.1
+Patch1: GConf2-2.6.0-fix-local-defaults-path-position.patch
+Patch2: GConf2-2.6.0-handle-entry-with-only-a-schema-name.patch
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -43,6 +52,9 @@ development using GConf.
 # work around glib-gettextize bug affecting tarball
 perl -pi -e 's/-lintl//g' aclocal.m4
 
+%patch1 -p1 -b .fix-local-defaults-path-position
+%patch2 -p1 -b .handle-entry-with-only-a-schema-name
+
 ## unpack pofiles
 ## tar zxf %{SOURCE2}
 
@@ -63,6 +75,7 @@ chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/gconf.xml.mandatory
 rm -f $RPM_BUILD_ROOT/%{_libdir}/GConf/2/libgconfbackend-xml.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/GConf/2/libgconfbackend-oldxml.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/GConf/2/*.la
 
 %find_lang %name
 
@@ -77,13 +90,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc COPYING ChangeLog NEWS README
 %config %{_sysconfdir}/gconf/2/path
-%dir /etc/gconf/gconf.xml.defaults
-%dir /etc/gconf/gconf.xml.mandatory
+%dir %{_sysconfdir}/gconf/2
+%dir %{_sysconfdir}/gconf/gconf.xml.defaults
+%dir %{_sysconfdir}/gconf/gconf.xml.mandatory
 %{_bindir}/*
 %{_libexecdir}/*
 %{_libdir}/*.so.*
 %{_libdir}/GConf/2/*.so
-%{_libdir}/GConf/2/*.la
 %{_datadir}/sgml
 %{_mandir}/man1/*
 %dir %{_libdir}/GConf
@@ -99,6 +112,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 14 2004 Warren Togami <wtogami@redhat.com> - 2.6.0-4
+- #110724 BR gtk2-devel gettext
+- #106283 add versioned ORBit2 minimum
+- #112863 own /etc/gconf/2/
+- really kill *.la
+
+* Mon Apr  5 2004 Mark McLoughlin <markmc@redhat.com> - 2.6.0-3
+- Remove the dont-dump-schema-default patch
+
+* Thu Apr  1 2004 Mark McLoughlin <markmc@redhat.com> - 2.6.0-2
+- Backport some fixes from HEAD for lockdown/deployment type stuff 
+
+* Tue Mar 23 2004 Alex Larsson <alexl@redhat.com> 2.6.0-1
+- update to 2.6.0
+
 * Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 58ddc06..2aef26b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd3d817f036980b37c346f97a10a5a92  GConf-2.5.90.tar.bz2
+241ca25941e5bfa0f71725c30e17ab6e  GConf-2.6.0.tar.bz2