diff --git a/boost_string_fixes.patch b/boost_string_fixes.patch
deleted file mode 100644
index 7483b62..0000000
--- a/boost_string_fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Adam Majer <amajer@suse.de>
-Date: Sat Feb 17 12:13:32 CET 2018
-
-Old boost seems to be missing some boost::optional functionality.
-This patch is a simple fix for a few problem spots. If this
-problem gets larger, it may need a more generic solution instead.
-
-
-Index: libreoffice-6.0.1.1/sw/source/core/txtnode/txatbase.cxx
-===================================================================
---- libreoffice-6.0.1.1.orig/sw/source/core/txtnode/txatbase.cxx
-+++ libreoffice-6.0.1.1/sw/source/core/txtnode/txatbase.cxx
-@@ -100,21 +100,21 @@ void SwTextAttr::dumpAsXml(xmlTextWriter
-         {
-             pWhich = "character format";
-             if (SwCharFormat* pCharFormat = GetCharFormat().GetCharFormat())
--                oValue = "name: " + OUStringToOString(pCharFormat->GetName(), RTL_TEXTENCODING_UTF8);
-+                *oValue = OString("name: " + OUStringToOString(pCharFormat->GetName(), RTL_TEXTENCODING_UTF8));
-             break;
-         }
-     case RES_TXTATR_INETFMT:
-         {
-             pWhich = "inet format";
-             const SwFormatINetFormat& rFormat = GetINetFormat();
--            oValue = "url: " + rFormat.GetValue().toUtf8();
-+            *oValue = OString("url: " + rFormat.GetValue().toUtf8());
-             break;
-         }
-     case RES_TXTATR_CJK_RUBY:
-         {
-             pWhich = "ruby";
-             const SwFormatRuby& rFormat = GetRuby();
--            oValue = "rubytext: " + rFormat.GetText().toUtf8();
-+            *oValue = OString("rubytext: " + rFormat.GetText().toUtf8());
-             break;
-         }
-     case RES_TXTATR_META:
diff --git a/libreoffice.changes b/libreoffice.changes
index 8e8bfcc..ce31c98 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 26 08:09:03 UTC 2018 - tchvatal@suse.com
+
+- Also drop boost_string_fixes.patch merged in upstream differently
+
 -------------------------------------------------------------------
 Thu Mar 22 11:46:48 UTC 2018 - tchvatal@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index fe3cd63..5ad9af9 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -95,7 +95,6 @@ Patch5:         0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch
 Patch7:         bnc1039203.patch
 # LO-L3: Slide with chart has some strange (too large?) elements (PPTX)
 Patch8:         bnc1060128.patch
-Patch500:       boost_string_fixes.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 BuildRequires:  %{name}-share-linker
@@ -879,8 +878,6 @@ Provides additional %{langname} translations and resources for %{project}. \
 %if 0%{?suse_version} < 1330
 # The rename of the configdir is needed only on older than factory for compat
 %patch1
-# fixes to satisfy old boost versions
-%patch500 -p1
 %endif # Leap 42/SLE-12
 %patch2
 %patch3