diff --git a/.cvsignore b/.cvsignore
index 6fe45ca..2294e2c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gedit-2.4.0.tar.bz2
+gedit-2.5.3.tar.bz2
diff --git a/gedit.spec b/gedit.spec
index bb538ce..773eee3 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,20 +1,21 @@
 %define glib2_version 2.2.0
 %define pango_version 1.2.0
 %define gtk2_version 2.2.0
-%define libgnomeui_version 2.4.0
-%define libgnomeprint_version 2.3.0
-%define libgnomeprintui_version 2.3.0
+%define libgnomeui_version 2.5.0
+%define libgnomeprint_version 2.5.0
+%define libgnomeprintui_version 2.5.0
 %define desktop_file_utils_version 0.3
 %define eel2_version 2.4.0
 %define gail_version 1.2.0
-%define gtksourceview_version 0.6
+%define gtksourceview_version 0.7
+%define eel2_version 2.5.0
 
-%define po_package gedit-2.4
+%define po_package gedit-2.6
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version:	2.4.0
-Release:        3
+Version:	2.5.3
+Release:        1
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -25,10 +26,12 @@ BuildRoot:	%{_tmppath}/gedit-%{version}-root
 PreReq:         scrollkeeper >= 0.1.4
 PreReq:         GConf2
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=124052
-Patch1: gedit-2.4.0-shelloutput.patch
-# http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=103933
-Patch2: gedit-2.4.0-64bit.patch
+# Hack until its clean with autotools-1.8
+Patch1: gedit-2.4.0-autotools18-hack.patch
+# Make the recent file locking a bit less annoying
+Patch2: gedit-2.4.0-lockf.patch
+# Allow Escape key to close Find and Replace dialogs
+Patch3: gedit-2.4.0-escapecancel.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -41,7 +44,8 @@ BuildRequires: aspell-devel
 BuildRequires: eel2-devel >= %{eel2_version} 
 BuildRequires: gail-devel >= %{gail_version}
 BuildRequires: gtksourceview-devel >= %{gtksourceview_version}
-BuildRequires: automake >= 1.7
+BuildRequires: automake >= 1.8
+BuildRequires: esound
 
 Requires: eel2 >= %{eel2_version}
 Requires: libgnomeui >= %{libgnomeui_version}
@@ -69,13 +73,14 @@ Install gedit-devel if you want to write plug-ins for gEdit.
 %prep
 %setup -n gedit-%{version} -q
 
-%patch1 -p1 -b .shelloutput
-%patch2 -p1 -b .64bit
+%patch1 -p1 -b .autotools18
+%patch2 -p1 -b .lockf
+%patch3 -p1 -b .escapecancel
 
 %build
 
-aclocal-1.7
-automake-1.7
+aclocal-1.8
+automake-1.8
 autoconf
 %configure
 make
@@ -140,10 +145,24 @@ scrollkeeper-update
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/gedit-2.4
-%{_libdir}/pkgconfig/gedit-2.4.pc
+%{_includedir}/gedit-2.6
+%{_libdir}/pkgconfig/gedit-2.6.pc
 
 %changelog
+* Wed Jan 28 2004 Alexander Larsson <alexl@redhat.com> 1:2.5.3-1
+- update to 2.5.3
+
+* Mon Jan 19 2004 Dan Williams <dcbw@redhat.com> 1:2.4.0-5
+- Work around recent files locking contention when using NFS
+    home directories (gnome.org #131930)
+- Make Find and Replace dialogs use a cancel button, so that
+    pressing escape makes them close (gnome.org #131927)
+
+* Thu Jan  8 2004 Dan Williams <dcbw@redhat.com> 1:2.4.0-4
+- Remeber file selector size and last directory on open/save
+   (gnome.org #123787)
+- Small hack to work around switch from autotools 1.7 - 1.8
+
 * Tue Oct 21 2003 Matt Wilson <msw@redhat.com> 1:2.4.0-3 
 - eel_read_entire_file takes a pointer to an int, not to a gsize
   (#103933)
diff --git a/sources b/sources
index f91cb5d..2b80daf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d8039773fd2f533bec4c9653854a4de  gedit-2.4.0.tar.bz2
+e6f24e886979c11e4c9dbe147c33af76  gedit-2.5.3.tar.bz2