diff --git a/lyx.changes b/lyx.changes
index 42bc463..4dbe63d 100644
--- a/lyx.changes
+++ b/lyx.changes
@@ -1,4 +1,8 @@
 -------------------------------------------------------------------
+Sat Dec 19 14:52:07 UTC 2015 - cornelis@solcon.nl
+
+- Added work-around-gcc5-bug.patch to fix boo#943840
+-------------------------------------------------------------------
 Mon Oct 12 08:24:33 UTC 2015 - cornelis@solcon.nl
 
 - Added Recommends: texlive-shapepar, which is needed by the
diff --git a/lyx.spec b/lyx.spec
index a4fe3a7..3fb8b9b 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -44,6 +44,8 @@ Source3:        ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-%{version}.tar.xz.sig
 # This was rejected by upstream (http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg133878.html)
 Patch0:         lyx-2.1.4-xdg_open.patch
 Patch1:         lyx-2.1.2.2-remove-date-time.patch
+# PATCH-FIX-USTREAM: fix for crash on Tumbleweed (boo#943840)
+Patch2:         work-around-gcc5-bug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       ImageMagick
 Requires:       ghostscript
@@ -114,6 +116,7 @@ document under "Help" on the menubar.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 #./autogen.sh
diff --git a/work-around-gcc5-bug.patch b/work-around-gcc5-bug.patch
new file mode 100644
index 0000000..ad73f53
--- /dev/null
+++ b/work-around-gcc5-bug.patch
@@ -0,0 +1,97 @@
+diff -ur a/src/output_xhtml.cpp b/src/output_xhtml.cpp
+--- a/src/output_xhtml.cpp	2015-07-24 19:55:28.000000000 +0200
++++ b/src/output_xhtml.cpp	2015-12-19 13:56:37.546589700 +0100
+@@ -245,68 +245,66 @@
+ 	return "";
+ }
+ 
+-StartTag fontToStartTag(html::FontTypes type)
+- {
+-	string tag = fontToTag(type);
++string fontToAttribute(html::FontTypes type)
++{
+ 	switch(type) {
+ 	case FT_EMPH:
+-		return html::StartTag(tag);
+ 	case FT_BOLD:
+-		return html::StartTag(tag);
++		return "";
+ 	case FT_NOUN:
+-		return html::StartTag(tag, "class='lyxnoun'");
++		return "class='lyxnoun'";
+ 	case FT_UBAR:
+-		return html::StartTag(tag);
++		return "";
+ 	case FT_DBAR:
+-		return html::StartTag(tag, "class='dline'");
++		return "class='dline'";
+ 	case FT_SOUT:
+-		return html::StartTag(tag, "class='strikeout'");
++		return "class='strikeout'";
+ 	case FT_WAVE:
+-		return html::StartTag(tag, "class='wline'");
++		return "class='wline'";
+ 	case FT_ITALIC:
+-		return html::StartTag(tag);
++		return "";
+ 	case FT_UPRIGHT:
+-		return html::StartTag(tag, "style='font-style:normal;'");
++		return "style='font-style:normal;'";
+ 	case FT_SLANTED:
+-		return html::StartTag(tag, "style='font-style:oblique;'");
++		return "style='font-style:oblique;'";
+ 	case FT_SMALLCAPS:
+-		return html::StartTag(tag, "style='font-variant:small-caps;'");
++		return "style='font-variant:small-caps;'";
+ 	case FT_ROMAN:
+-		return html::StartTag(tag, "style='font-family:serif;'");
++		return "style='font-family:serif;'";
+ 	case FT_SANS:
+-		return html::StartTag(tag, "style='font-family:sans-serif;'");
++		return "style='font-family:sans-serif;'";
+ 	case FT_TYPE:
+-		return html::StartTag(tag, "style='font-family:monospace;'");
++		return "style='font-family:monospace;'";
+ 	case FT_SIZE_TINY:
+ 	case FT_SIZE_SCRIPT:
+ 	case FT_SIZE_FOOTNOTE:
+-		return html::StartTag(tag, "style='font-size:x-small;'");
++		return "style='font-size:x-small;'";
+ 	case FT_SIZE_SMALL:
+-		return html::StartTag(tag, "style='font-size:small;'");
++		return "style='font-size:small;'";
+ 	case FT_SIZE_NORMAL:
+-		return html::StartTag(tag, "style='font-size:normal;'");
++		return "style='font-size:normal;'";
+ 	case FT_SIZE_LARGE:
+-		return html::StartTag(tag, "style='font-size:large;'");
++		return "style='font-size:large;'";
+ 	case FT_SIZE_LARGER:
+ 	case FT_SIZE_LARGEST:
+-		return html::StartTag(tag, "style='font-size:x-large;'");
++		return "style='font-size:x-large;'";
+ 	case FT_SIZE_HUGE:
+ 	case FT_SIZE_HUGER:
+-		return html::StartTag(tag, "style='font-size:xx-large;'");
++		return "style='font-size:xx-large;'";
+ 	case FT_SIZE_INCREASE:
+-		return html::StartTag(tag, "style='font-size:larger;'");
++		return "style='font-size:larger;'";
+ 	case FT_SIZE_DECREASE:
+-		return html::StartTag(tag, "style='font-size:smaller;'");
++		return "style='font-size:smaller;'";
+ 	}
+ 	// kill warning
+-	return StartTag("");
++	return "";
+ }
+ 
+ } // end anonymous namespace
+ 
+ 
+ FontTag::FontTag(FontTypes type)
+-  : StartTag(fontToStartTag(type)), font_type_(type)
++  : StartTag(fontToTag(type), fontToAttribute(type)), font_type_(type)
+ {}
+ 
+