diff --git a/0001-tdf-94936-Update-the-button-removal-hack-to-3.18.patch b/0001-tdf-94936-Update-the-button-removal-hack-to-3.18.patch
new file mode 100644
index 0000000..298012f
--- /dev/null
+++ b/0001-tdf-94936-Update-the-button-removal-hack-to-3.18.patch
@@ -0,0 +1,32 @@
+From c1b97d2747004d1912744ab7ff11353a73713310 Mon Sep 17 00:00:00 2001
+From: Maxim Monastirsky <momonasmon@gmail.com>
+Date: Sat, 17 Oct 2015 23:42:15 +0300
+Subject: [PATCH] tdf#94936 Update the button removal hack to 3.18
+
+Gtk 3.18 has the filename entry in the header too.
+
+Change-Id: Id1abf5baf0e82c03e27ede2bfc67ec1983a2c4fb
+---
+ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+index ac9f8d1..4f35390 100644
+--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
++++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+@@ -425,7 +425,11 @@ dialog_remove_buttons(GtkWidget *pActionArea)
+         gtk_container_get_children( GTK_CONTAINER( pActionArea ) );
+ 
+     for( GList *p = pChildren; p; p = p->next )
+-        gtk_widget_destroy( GTK_WIDGET( p->data ) );
++    {
++        GtkWidget *pWidget = GTK_WIDGET( p->data );
++        if ( GTK_IS_BUTTON( pWidget ) )
++            gtk_widget_destroy( pWidget );
++    }
+ 
+     g_list_free( pChildren );
+ }
+-- 
+2.5.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 191701f..a25d64d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -53,7 +53,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        3%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -340,6 +340,7 @@ Patch31: 0001-implement-save-slide-background-for-impress.patch
 Patch32: 0001-Related-tdf-72880-presumably-using-startcenter-as-ge.patch
 Patch33: 0001-tdf-94804-sw-allow-duplicate-heading-cross-reference.patch
 Patch34: 0001-implement-dialog-control-over-enhanced-shape-control.patch
+Patch35: 0001-tdf-94936-Update-the-button-removal-hack-to-3.18.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2459,6 +2460,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Nov 03 2015 Caolán McNamara <caolanm@redhat.com> - 1:5.0.3.2-3
+- Resolves: rhbz#1277090 crash in gtk3 vclplug on file save
+
 * Tue Nov 03 2015 David Tardon <dtardon@redhat.com> - 1:5.0.3.2-2
 - Resolves: rhbz#1276061 build failure on ppc64