diff --git a/.cvsignore b/.cvsignore
index 23335a6..1d987ea 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 gedit-2.7.92.tar.bz2
 gedit-2.8.0.tar.bz2
 gedit-2.8.1.tar.bz2
+gedit-2.9.5.tar.bz2
diff --git a/gedit.spec b/gedit.spec
index c71175e..add0f35 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,26 +1,25 @@
-%define glib2_version 2.2.0
-%define pango_version 1.2.0
-%define gtk2_version 2.2.0
-%define libgnomeui_version 2.5.0
+%define glib2_version 2.6.0
+%define pango_version 1.8.0
+%define gtk2_version 2.6.0
+%define libgnomeui_version 2.6.0
 %define libgnomeprint_version 2.7.1
 %define libgnomeprintui_version 2.7.1
 %define desktop_file_utils_version 0.9
-%define eel2_version 2.4.0
+%define eel2_version 2.6.0
 %define gail_version 1.2.0
-%define gtksourceview_version 1.1
-%define eel2_version 2.5.0
+%define gtksourceview_version 1.1.91
 
 %define po_package gedit-2.6
 
-Summary:		gEdit is a small but powerful text editor for GNOME.
+Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version:		2.8.1
-Release:		2
+Version:	2.9.5
+Release:	1
 Epoch:		1
-License:		GPL
+License:	GPL
 Group:		Applications/Editors
-Source0:		http://ftp.gnome.org/pub/GNOME/sources/gedit/2.8/gedit-%{version}.tar.bz2
-URL:			http://gedit.sourceforge.net/
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/2.8/gedit-%{version}.tar.bz2
+URL:		http://gedit.sourceforge.net/
 BuildRoot:	%{_tmppath}/gedit-%{version}-root
 
 PreReq:		scrollkeeper >= 0.1.4
@@ -31,9 +30,6 @@ PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
 Patch3: gedit-2.4.0-escapecancel.patch
 # Make the file selector remember last window size and directory
 Patch4: gedit-2.5.90-filesel.patch
-# Use Pango font names
-# http://bugzilla.gnome.org/show_bug.cgi?id=143877
-Patch5: gedit-2.7.90-pango-fonts.patch
 Patch6: gedit-2.7.92-opensize.patch
 Patch7: gedit-2.7.92-enable-plugins.patch
 
@@ -48,8 +44,6 @@ BuildRequires: aspell-devel
 BuildRequires: eel2-devel >= %{eel2_version} 
 BuildRequires: gail-devel >= %{gail_version}
 BuildRequires: gtksourceview-devel >= %{gtksourceview_version}
-BuildRequires: automake >= 1.8
-BuildRequires: intltool >= 0.31
 BuildRequires: scrollkeeper gettext
 
 Requires: eel2 >= %{eel2_version}
@@ -82,17 +76,10 @@ Install gedit-devel if you want to write plug-ins for gEdit.
 
 %patch3 -p1 -b .escapecancel
 %patch4 -p1 -b .filesel
-%patch5 -p0 -b .pango-fonts
 %patch6 -p1 -b .opensize
 %patch7 -p1 -b .enable-plugins
 
 %build
-
-#
-# gedit-2.7.90 was built with intltool-0.30 which corrupted
-# the generated schema files
-# 
-intltoolize --force --copy
 %configure
 make
 
@@ -103,9 +90,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-## http://bugzilla.gnome.org/show_bug.cgi?id=89654
-perl -pi -e 's/Utility;TextEditor/Utility;TextEditor;/' $RPM_BUILD_ROOT%{_datadir}/applications/* 
-
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
@@ -157,10 +141,13 @@ scrollkeeper-update
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/gedit-2.8
-%{_libdir}/pkgconfig/gedit-2.8.pc
+%{_includedir}/gedit-2.9
+%{_libdir}/pkgconfig/gedit-2.9.pc
 
 %changelog
+* Sun Jan 30 2005 Matthias Clasen <mclasen@redhat.com> 1:2.9.5-1
+- Update to 2.9.5
+
 * Thu Nov  4 2004 Marco Pesenti Gritti <mpg@redhat.com> 1:2.8.1-2
 - Update the desktop files database. (RH Bug: 135571)
 
diff --git a/sources b/sources
index c798396..2fb607f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-89052aec40b7447eb11d73134d71e812  gedit-2.8.1.tar.bz2
+ab03fe4fad94154b8729feb950237433  gedit-2.9.5.tar.bz2