diff --git a/0001-rhbz-1286416-Be-more-resilient-during-auto-recovery-.patch b/0001-rhbz-1286416-Be-more-resilient-during-auto-recovery-.patch
new file mode 100644
index 0000000..8db6ff4
--- /dev/null
+++ b/0001-rhbz-1286416-Be-more-resilient-during-auto-recovery-.patch
@@ -0,0 +1,29 @@
+From 8d8ed1f087e13d3e9412c67bdb9ac446d8dfe87f Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Mon, 30 Nov 2015 11:38:21 +0100
+Subject: [PATCH] rhbz#1286416: Be more resilient during auto-recovery attempts
+
+...called from within the signal handler, so any bets are off
+
+Change-Id: Iedb5c7bc8d08350e5f3e3118c6713f5c25b238b6
+(cherry picked from commit 9b3ca276dae6f8d4f337c78e64ed6b7f7e7662ef)
+---
+ framework/source/services/autorecovery.cxx | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
+index 8b75271..b05fdc3 100644
+--- a/framework/source/services/autorecovery.cxx
++++ b/framework/source/services/autorecovery.cxx
+@@ -2480,6 +2480,8 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
+         return;
+ 
+     css::uno::Reference< css::frame::XFrame >   xFrame   = xController->getFrame();
++    if (!xFrame.is())
++        return;
+     css::uno::Reference< css::frame::XDesktop > xDesktop (xFrame->getCreator(), css::uno::UNO_QUERY);
+     if (!xDesktop.is())
+         return;
+-- 
+2.4.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 48be367..160e378 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:        8%{?libo_prerelease}%{?dist}
+Release:        9%{?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/
@@ -352,6 +352,7 @@ Patch43: 0001-gtk3-implement-drawPolyLine-for-svp-gtk3-backend.patch
 Patch44: 0001-Resolves-rhbz-1283426-using-vdevs-based-on-now-dead-.patch
 Patch45: 0001-backport-5-1-idle-timers-loop-to-5-0.patch
 Patch46: 0001-gtk3-implement-SAL_INVERT_50-rectangle-case.patch
+Patch47: 0001-rhbz-1286416-Be-more-resilient-during-auto-recovery-.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2472,6 +2473,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Mon Nov 30 2015 Stephan Bergmann <sbergman@redhat.com> - 1:5.0.3.2-9-UNBUILT
+- Related: rhbz#1286416 Be more resilient during auto-recovery attempts
+
 * Sun Nov 29 2015 Caolán McNamara <caolanm@redhat.com> - 1:5.0.3.2-8
 - Related: rhbz#1277445 backport 5-1 idle + timers + mainloop to 5.0