diff --git a/vim-7.2.257.patch b/vim-7.2.257.patch
new file mode 100644
index 0000000..f791a24
--- /dev/null
+++ b/vim-7.2.257.patch
@@ -0,0 +1,61 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.257
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.257
+Problem:    With GTK 2.17 lots of assertion error messages.
+Solution:   Remove check for static gravity. (Sebastian Droege)
+Files:	    src/gui_gtk_f.c
+
+
+*** ../vim-7.2.256/src/gui_gtk_f.c	2009-05-17 23:25:16.000000000 +0200
+--- src/gui_gtk_f.c	2009-09-11 15:15:41.000000000 +0200
+***************
+*** 860,870 ****
+  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
+  {
+  #ifdef HAVE_GTK2
+!     gboolean static_gravity_supported;
+! 
+!     static_gravity_supported = gdk_window_set_static_gravities(window,
+! 							       use_static);
+!     g_return_if_fail(static_gravity_supported);
+  #else
+      XSetWindowAttributes xattributes;
+  
+--- 860,868 ----
+  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
+  {
+  #ifdef HAVE_GTK2
+!     /* We don't check if static gravity is actually supported, because it
+!      * results in an annoying assertion error message. */
+!     gdk_window_set_static_gravities(window, use_static);
+  #else
+      XSetWindowAttributes xattributes;
+  
+*** ../vim-7.2.256/src/version.c	2009-09-11 15:46:20.000000000 +0200
+--- src/version.c	2009-09-11 16:16:52.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     257,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
+     in the front doorway permanently so it always looks like you are
+     actually attempting to do something about that mess that has amassed
+     since you discovered the Internet.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim.changes b/vim.changes
index d37b9da..9d438a8 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 13 12:04:46 CEST 2009 - mmarek@suse.cz
+
+- add patch vim-7.2.257.patch to hide gtk assertions (bnc#536535).
+
 -------------------------------------------------------------------
 Mon Sep 28 15:32:01 CEST 2009 - werner@suse.de
 
diff --git a/vim.spec b/vim.spec
index 430e6cc..972a1e8 100644
--- a/vim.spec
+++ b/vim.spec
@@ -20,9 +20,9 @@
 
 Name:           vim
 Version:        7.2
-Release:        14
+Release:        15
 #
-License:        Other uncritical OpenSource License ; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
+License:        Other uncritical OpenSource License  ; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -96,6 +96,8 @@ Patch22:        vim-7.1-remove-terrible-hack.patch
 Patch23:        vim-7.2-php.patch
 Patch24:        vim-7.2-lib64.patch
 Patch25:        vim-7.2-lzma-support.patch
+# PATCH-FIX-UPSTREAM vim-7.2.257.patch bnc#536535 mmarek@novell.com -- Hide gtk assertions.
+Patch26:        vim-7.2.257.patch
 Patch100:       vim-7.1.314-CVE-2009-0316-debian.patch
 # tbd???        %name-6.3-ga-utf8.diff
 # tbd???        %name-6.3-initvals.diff
@@ -124,7 +126,7 @@ Authors:
     Bram Moolenaar <bram@vim.org>
 
 %package data
-License:        Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
+License:        Other uncritical OpenSource License  ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
 PreReq:         %{vim_prereq}
 #
@@ -151,7 +153,7 @@ Authors:
     Bram Moolenaar <bram@vim.org>
 
 %package base
-License:        Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
+License:        Other uncritical OpenSource License  ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
 PreReq:         %{vim_prereq}
 PreReq:         update-alternatives
@@ -253,7 +255,7 @@ Authors:
 %endif
 
 %package -n gvim
-License:        Other uncritical OpenSource License ; Charityware. If you wish please donate to Uganda
+License:        Other uncritical OpenSource License  ; Charityware. If you wish please donate to Uganda
 Group:          Productivity/Editors/Vi
 PreReq:         %{gvim_prereq}
 PreReq:         update-alternatives
@@ -313,6 +315,7 @@ unset p
 %patch23
 %patch24
 %patch25
+%patch26
 %patch100 -p1
 cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} .
 rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*