diff --git a/gimp-2.6.4.tar.bz2 b/gimp-2.6.4.tar.bz2
deleted file mode 100644
index 77fa17d..0000000
--- a/gimp-2.6.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86d27a45b45f3df3bf6de28718f691e8bedaf1de7dae287b39054eaddad797e2
-size 16012685
diff --git a/gimp-2.6.5.tar.bz2 b/gimp-2.6.5.tar.bz2
new file mode 100644
index 0000000..6e735a2
--- /dev/null
+++ b/gimp-2.6.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6209081f5c29fc22e0d376367b017618f7afb0b179f994b16b4cc68106cbe521
+size 16043778
diff --git a/gimp-enable-gtk-deprecated.patch b/gimp-enable-gtk-deprecated.patch
new file mode 100644
index 0000000..0a91895
--- /dev/null
+++ b/gimp-enable-gtk-deprecated.patch
@@ -0,0 +1,13 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -36899,7 +36899,7 @@ if test "x$have_glib_2_19" != "xyes"; th
+ fi
+ 
+ if test "x$have_gtk_2_15" != "xyes"; then
+-  CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
++  CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED"
+ fi
+ 
+ if test "x$have_pango_1_21" != "xyes"; then
diff --git a/gimp.changes b/gimp.changes
index 0423192..72b1f0c 100644
--- a/gimp.changes
+++ b/gimp.changes
@@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Tue Feb 17 03:16:35 CET 2009 - vuntz@novell.com
+
+- Remove some BuildRequires:
+  + libcurl-devel: not needed since we have gio
+  + gnome-keyring-devel, gnome-vfs2-devel, libgnomeui-devel: not
+    needed either since we have gio
+- Fix Provides/Obsoletes for gimp-doc in devel package.
+
+-------------------------------------------------------------------
+Mon Feb 16 07:39:48 CET 2009 - mboman@suse.de
+
+- Update to version 2.6.5:
+  + bgo#571628 – Scaling image to 25% turn background from white
+    to grey
+  + bgo#567840 – GIMP's GtkScaleButton conflicts with GTK's
+  + bgo#569043 – GEGL tool - missing Operation Settings for all
+    sub-tools
+  + bgo#568890 – don't rely on GtkAction implementation details
+  + bgo#568909 – wrong RGB values for color names in
+    libgimpcolor/gimprgb-parse.c
+  + bgo#568839 – wrong hex RGB value for the color names slategrey
+    and slategray
+  + bgo#559408 - Brushes dragged to the image window look strange
+  + bgo#563337 – Rectangle Select Tool does not allow 1:1 fixed
+    ratio
+  + bgo#568016 – Black pullout parameter of plug-in-newsprint has
+    no effect
+  + bgo#562818 – First image opened in GIMP offset
+  + bgo#562213 – Align Tool doesn't work properly if it is the
+    active tool at startup
+  + Translation updates
+- Add gimp-enable-gtk-deprecated.patch due to using deprecated
+  API call gtk_widget_get_action. Upstream is working on it so
+  could probably be removed with the next version update
+- Merge gtk-doc from -doc to -devel
+- Fix BuildRequires according to what's in configure.ac:
+    * Add: babl-devel, cairo-devel, fontconfig-devel, glib2-devel,
+           gnome-keyring-devel, gnome-vfs2-devel, gtk2-devel,
+           libcurl-devel, libpng-devel, pango-devel,
+           xorg-x11-libXfixes-devel
+    * Remove: BuildRequires: alsa-devel, cups, cups-devel,
+              curl-devel, gnome-common, gnutls-devel, gtk-doc,
+              libgimpprint, libgimpprint-devel, libglade2-devel,
+              libgnomeprintui-devel, libgtkhtml-devel,
+              libwnck-devel, perl-XML-Parser, postfix,
+              python-devel, slang-devel
+
 -------------------------------------------------------------------
 Tue Feb 10 20:49:36 CET 2009 - vuntz@novell.com
 
diff --git a/gimp.spec b/gimp.spec
index a4b5ee9..4734ecb 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gimp (Version 2.6.4)
+# spec file for package gimp (Version 2.6.5)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,11 +19,33 @@
 
 
 Name:           gimp
-#!BuildIgnore: sendmail
-BuildRequires:  aalib-devel alsa-devel cups cups-devel curl-devel dbus-1-glib-devel gegl-devel gnome-common gnutls-devel gtk-doc hal-devel intltool iso-codes-devel libexif-devel libgimpprint libgimpprint-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgtkhtml-devel liblcms-devel libmng-devel libpoppler-glib-devel librsvg-devel libtiff-devel libwebkit-devel libwmf-devel libwnck-devel perl-XML-Parser postfix python-devel python-gtk-devel slang-devel update-desktop-files
+BuildRequires:  aalib-devel
+BuildRequires:  babl-devel
+BuildRequires:  cairo-devel
+BuildRequires:  dbus-1-glib-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  gegl-devel
+BuildRequires:  glib2-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  hal-devel
+BuildRequires:  intltool
+BuildRequires:  iso-codes-devel
+BuildRequires:  libexif-devel
+BuildRequires:  liblcms-devel
+BuildRequires:  libmng-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libpoppler-glib-devel
+BuildRequires:  librsvg-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libwebkit-devel
+BuildRequires:  libwmf-devel
+BuildRequires:  pango-devel
+BuildRequires:  python-gtk-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  xorg-x11-libXfixes-devel
 Url:            http://www.gimp.org/
-Version:        2.6.4
-Release:        2
+Version:        2.6.5
+Release:        1
 License:        GPL v2 or later
 Group:          Productivity/Graphics/Bitmap Editors
 Suggests:       AdobeICCProfiles
@@ -33,6 +55,8 @@ Requires:       %{name}-lang = %{version}
 Requires:       gtk2 >= 2.12.1
 Summary:        The GNU Image Manipulation Program
 Source:         ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gimp-enable-gtk-deprecated.patch mboman@suse.de - Don't use -DGTK_DISABLE_DEPRECATED due to still using gtk_widget_get_action
+Patch0:         gimp-enable-gtk-deprecated.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %{name}-branding >= 2.4
 Recommends:     %{name}-plugins-python = %{version} gimp-2.0-scanner-plugin
@@ -648,6 +672,8 @@ Requires:       %{name} = %{version} gtk2-devel glib2-devel glibc-devel
 Provides:       gimp-2.0-devel = %{version}
 Obsoletes:      gimp-unstable-devel < 2.6.0
 Group:          Productivity/Graphics/Bitmap Editors
+Obsoletes:      gimp-doc <= 2.6.4
+Provides:       gimp-doc = 2.6.4
 
 %description devel
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -842,220 +868,13 @@ Authors:
     Matthew Wilson
     Shirasaki Yasuhiro
 
-%package doc
-License:        GPL v2 or later
-Summary:        The GNU Image Manipulation Program
-Requires:       %{name} = %{version}
-Provides:       gimp-2.0-doc = %{version}
-Obsoletes:      gimp-unstable-doc < 2.6.0
-Group:          Productivity/Graphics/Bitmap Editors
-
-%description doc
-The GIMP (GNU Image Manipulation Program) is a powerful image
-composition and editing program, which can be extremely useful for
-creating logos and other graphics for Web pages.  The GIMP offers many
-of the tools and filters you would expect to find in similar commercial
-offerings and contains some interesting extras as well. The GIMP
-provides alarge image manipulation toolbox, including channel
-operations and layers, effects, subpixel imaging and antialiasing, and
-conversions- all including multilevel undo. The GIMP offers a scripting
-facility, but many of the included scripts rely on fonts that we cannot
-distribute. The GIMP FTP sitehas a package of fonts that you need to
-run the included scripts and that you can install yourself. Some of the
-fonts have unusual licensing requirements, but all the licenses are
-documented in the package. Get
-ftp://ftp.gimp.org/pub/gimp/fonts/freefonts-0.10.tar.gz and
-ftp://ftp.gimp.org/pub/gimp/fonts/sharefonts-0.10.tar.gz if you like to
-do so. Alternatively, choose fonts that exist on your systembefore
-running the scripts.
-
-
-
-Authors:
---------
-    Spencer Kimball
-    Peter Mattis
-    Lauri Alanko
-    Shawn Amundson
-    Sven Anders
-    Karl-Johan Andersson
-    John Beale
-    Zach Beane
-    Tom Bech
-    Marc Bless
-    Edward Blevins
-    Reagan Blundell
-    Xavier Bouchoux
-    Roberto Boyd
-    Stanislav Brabec
-    Robert Brady
-    Hans Breuer
-    Simon Budig
-    Carey Bunks
-    Seth Burgess
-    Brent Burton
-    Francisco Bustamante
-    Albert Cahalan
-    Sean Cier
-    Winston Chang
-    Kenneth Christiansen
-    Zbigniew Chyla
-    Ed Connel
-    Piers Cornwell
-    Daniel Cotting
-    Jay Cox
-    Brian Degenhardt
-    Gert Dewit
-    Andreas Dilger
-    Austin Donnelly
-    Scott Draves
-    Daniel Dunbar
-    Misha Dynin
-    Daniel Egger
-    Morton Eriksen
-    Larry Ewing
-    Nick Fetchak
-    Valek Filippov
-    David Forsyth
-    Raphael Francois
-    Jochen Friedrich
-    Sami Gerdt
-    Jim Geuther
-    Graeme Gill
-    Scott Goehring
-    Heiko Goller
-    Marcelo de Gomensoro Malheiros
-    Pavel Grinfeld
-    Michael Hammel
-    Henrik Hansen
-    Ville Hautamaki
-    James Henstridge
-    Eric Hernes
-    David Hodson
-    Christoph Hoegl
-    Wolfgang Hofer
-    Jan Hubicka
-    Andreas Hyden
-    Ben Jackson
-    Krzysztof Jakubowski
-    Simon Janes
-    Tim Janik
-    Fellmann Joaquim
-    Andrew Kieschnick
-    Peter Kirchgessner
-    Philipp Klaus
-    David Koblas
-    Robert L Krawitz
-    Tuomas Kuosmanen
-    Karin Kylander
-    Olof S Kylander
-    Karl La Rocca
-    Chris Lahey
-    Nick Lamb
-    Marco Lamberto
-    Jens Lautenbacher
-    Laramie Leavitt
-    Elliot Lee
-    Marc Lehmann
-    Ray Lehtiniemi
-    Raph Levien
-    Wing Tung Leung
-    Adrian Likins
-    Tor Lillqvist
-    Ingo Luetkebohle
-    Josh MacDonald
-    Ed Mackey
-    Vidar Madsen
-    Ian Main
-    Kjartan Maraas
-    Kelly Martin
-    Torsten Martinsen
-    Gordon Matzigkeit
-    Gregory McLean
-    Daniele Medri
-    Federico Mena Quintero
-    James Mitchell
-    Hirotsuna Mizuno
-    David Monniaux
-    Adam D Moss
-    Balazs Nagy
-    Yukihiro Nakai
-    Sung-Hyun Nam
-    Shuji Narazaki
-    Felix Natter
-    Michael Natterer
-    David Neary
-    Sven Neumann
-    Stephen Robert Norris
-    Tim Newsome
-    Erik Nygren
-    Miles O'Neal
-    David Neary
-    David Necas
-    David Odin
-    Thom van Os
-    Garry R. Osgood
-    Alan Paeth
-    Jay Painter
-    Sergey Panov
-    Ville Patsi
-    Asbjorn Pettersen
-    Mike Phillips
-    Artur Polaczynski
-    Raphael Quinet
-    Tom Rathborne
-    Vincent Renardias
-    Jens Restemeier
-    Maurits Rijk
-    Daniel Risacher
-    James Robinson
-    Guillermo S. Romero
-    Tim Rowley
-    Pablo Saratxaga
-    Mike Schaeffer
-    John Schlag
-    Norbert Schmitz
-    Thorsten Schnier
-    Alexander Schulz
-    Tracy Scott
-    Craig Setera
-    Aaron Sherman
-    Manish Singh
-    Daniel Skarda
-    Adam Spiers
-    Jakub Steiner
-    Nathan Summers
-    Mike Sweet
-    Yuri Syrota
-    Eiichi Takamori
-    Tristan Tarrant
-    Michael Taylor
-    Owen Taylor
-    Ian Tester
-    Andy Thomas
-    Kevin Turner
-    Rebecca Walter
-    Martin Weber
-    James Wang
-    Kris Wehner
-    Nigel Wetten
-    Calvin Williamson
-    Matthew Wilson
-    Shirasaki Yasuhiro
-
 %lang_package
 %prep
 %setup -q
-# We can ignore these warnings:
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22197
-# spline.c: 47
-# fit.c: 1310
+%patch0 -p0
 
 %build
-#aclocal
-#automake
-autoconf
-# needed for gimp-2.4.0:
+#autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure --with-pic\
 	--disable-static\
@@ -1137,12 +956,54 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-
-%files doc
-%defattr(-,root,root)
+# Own these repositories to not depend on gtk-doc while building:
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Feb 17 2009 vuntz@novell.com
+- Remove some BuildRequires:
+  + libcurl-devel: not needed since we have gio
+  + gnome-keyring-devel, gnome-vfs2-devel, libgnomeui-devel: not
+  needed either since we have gio
+- Fix Provides/Obsoletes for gimp-doc in devel package.
+* Mon Feb 16 2009 mboman@suse.de
+- Update to version 2.6.5:
+  + bgo#571628 – Scaling image to 25%% turn background from white
+  to grey
+  + bgo#567840 – GIMP's GtkScaleButton conflicts with GTK's
+  + bgo#569043 – GEGL tool - missing Operation Settings for all
+  sub-tools
+  + bgo#568890 – don't rely on GtkAction implementation details
+  + bgo#568909 – wrong RGB values for color names in
+  libgimpcolor/gimprgb-parse.c
+  + bgo#568839 – wrong hex RGB value for the color names slategrey
+  and slategray
+  + bgo#559408 - Brushes dragged to the image window look strange
+  + bgo#563337 – Rectangle Select Tool does not allow 1:1 fixed
+  ratio
+  + bgo#568016 – Black pullout parameter of plug-in-newsprint has
+  no effect
+  + bgo#562818 – First image opened in GIMP offset
+  + bgo#562213 – Align Tool doesn't work properly if it is the
+  active tool at startup
+  + Translation updates
+- Add gimp-enable-gtk-deprecated.patch due to using deprecated
+  API call gtk_widget_get_action. Upstream is working on it so
+  could probably be removed with the next version update
+- Merge gtk-doc from -doc to -devel
+- Fix BuildRequires according to what's in configure.ac:
+  * Add: babl-devel, cairo-devel, fontconfig-devel, glib2-devel,
+  gnome-keyring-devel, gnome-vfs2-devel, gtk2-devel,
+  libcurl-devel, libpng-devel, pango-devel,
+  xorg-x11-libXfixes-devel
+  * Remove: BuildRequires: alsa-devel, cups, cups-devel,
+  curl-devel, gnome-common, gnutls-devel, gtk-doc,
+  libgimpprint, libgimpprint-devel, libglade2-devel,
+  libgnomeprintui-devel, libgtkhtml-devel,
+  libwnck-devel, perl-XML-Parser, postfix,
+  python-devel, slang-devel
 * Tue Feb 10 2009 vuntz@novell.com
 - Remove non-upstream translations: they'll get out-of-date.
 * Mon Jan 19 2009 crrodriguez@suse.de