diff --git a/boost.spec b/boost.spec
index a593fc7..2d75e0c 100644
--- a/boost.spec
+++ b/boost.spec
@@ -58,33 +58,34 @@ Group:		Development/C++
 URL:		http://boost.org
 Source0:	http://download.sourceforge.net/boost/boost_%{packver}.tar.bz2
 Source100:	%{name}.rpmlintrc
-# https://bugzilla.redhat.com/show_bug.cgi?id=1102667
-Patch0:		boost-1.57.0-python-abi_letters.patch
-Patch1:		boost-1.57.0-python-libpython_dep.patch
-Patch2:		boost-1.55.0-python-test-PyImport_AppendInittab.patch
 # https://svn.boost.org/trac/boost/ticket/6150
-Patch4:		boost-1.50.0-fix-non-utf8-files.patch
+Patch4:     boost-1.50.0-fix-non-utf8-files.patch
+
 # Add a manual page for the sole executable, namely bjam, based on the
 # on-line documentation:
 # http://www.boost.org/boost-build2/doc/html/bbv2/overview.html
-Patch5:		boost-1.48.0-add-bjam-man-page.patch
+Patch5:     boost-1.48.0-add-bjam-man-page.patch
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=756005
 # https://svn.boost.org/trac/boost/ticket/6131
-Patch7:		boost-1.50.0-foreach.patch
+Patch7:     boost-1.50.0-foreach.patch
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=783660
 # https://svn.boost.org/trac/boost/ticket/6459 fixed
-Patch10:	boost-1.50.0-long-double-1.patch
+Patch10:    boost-1.50.0-long-double-1.patch
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=784654
-Patch12:	boost-1.50.0-polygon.patch
+Patch12:    boost-1.50.0-polygon.patch
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=828856
 # https://bugzilla.redhat.com/show_bug.cgi?id=828857
-Patch15:	boost-1.61.0-pool.patch
-# From https://github.com/dealii/dealii/pull/6126
-# To use this old boost with libc++ from LLVM
-# (e.g. to build LibreOffice 6.x in rosa2016.1 where libstdc++
-# is too old and does not support C++17)
-Patch16:	0001-Minimal-compatibility-with-C-17.patch
-Patch17:	0002-Avoid-auto_ptr-in-bundled-boost.patch
+Patch15:    boost-1.50.0-pool.patch
+
+Patch17:    boost-1.57.0-python-libpython_dep.patch
+Patch18:    boost-1.57.0-python-abi_letters.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1190039
+Patch19:    boost-1.57.0-build-optflags.patch
+#Patch21:   boost-unrecognized-option.patch
 BuildRequires:	doxygen
 BuildRequires:	xsltproc
 BuildRequires:	bzip2-devel
@@ -514,7 +515,7 @@ running programs dynamically linked against Boost python.
 
 %files -n %{libpython}
 %doc LICENSE_1_0.txt
-%{_libdir}/libboost_python.so.%{version}
+%{_libdir}/libboost_python27.so.%{version}
 
 #----------------------------------------------------------------------------
 
@@ -782,6 +783,7 @@ symlinks needed for Boost development.
 %{_includedir}/boost
 %{_libdir}/libboost_*.so
 %exclude %{_libdir}/libboost_python3.so
+%{_libdir}/cmake/*
 
 #----------------------------------------------------------------------------
 
@@ -838,17 +840,19 @@ symlinks needed for Boost development.
 
 %prep
 %setup -qn boost_%{packver}
-%patch0 -p1
-%patch1 -p1
+#patch0 -p1
+#patch1 -p1
 #patch2 -p1
 %patch4 -p1
 %patch5 -p1
-#patch7 -p2
+%patch7 -p1
 %patch10 -p1
-#patch12 -p3
-%patch15 -p0
+%patch12 -p1
+%patch15 -p1
 #patch16 -p1
-#patch17 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 # Preparing the docs
 mkdir packagedoc