diff --git a/0001-Gui-skip-ci-fix-Wodr.patch b/0001-Gui-skip-ci-fix-Wodr.patch
new file mode 100644
index 0000000..45be8ce
--- /dev/null
+++ b/0001-Gui-skip-ci-fix-Wodr.patch
@@ -0,0 +1,54 @@
+From 6bd39e8a90e65d81733e06d73bc627387808c772 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Tue, 24 Nov 2020 15:46:46 +0100
+Subject: [PATCH] Gui: [skip ci] fix -Wodr The forward declarations of
+ QuantitySpinBox and Ui_TaskAppearance were done in the wrong namespace
+
+---
+ src/Gui/TaskCSysDragger.h         | 3 +--
+ src/Gui/TaskView/TaskAppearance.h | 5 +++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/Gui/TaskCSysDragger.h b/src/Gui/TaskCSysDragger.h
+index 721cc51c8d..b2dcad3b5e 100644
+--- a/src/Gui/TaskCSysDragger.h
++++ b/src/Gui/TaskCSysDragger.h
+@@ -26,10 +26,9 @@
+ #include <Gui/TaskView/TaskDialog.h>
+ #include <App/DocumentObserver.h>
+ 
+-class QuantitySpinBox;
+-
+ namespace Gui
+ {
++  class QuantitySpinBox;
+   class SoFCCSysDragger;
+   class ViewProviderDragger;
+   
+diff --git a/src/Gui/TaskView/TaskAppearance.h b/src/Gui/TaskView/TaskAppearance.h
+index 1e3de8a898..b637053f33 100644
+--- a/src/Gui/TaskView/TaskAppearance.h
++++ b/src/Gui/TaskView/TaskAppearance.h
+@@ -29,16 +29,17 @@
+ #include <boost/signals2.hpp>
+ 
+ 
+-class Ui_TaskAppearance;
+-
+ namespace App {
+ class Property;
+ }
+ 
+ namespace Gui {
+ class ViewProvider;
++
+ namespace TaskView {
++
+ typedef boost::signals2::connection TaskAppearance_Connection;
++class Ui_TaskAppearance;
+ 
+ class TaskAppearance : public TaskBox, public Gui::SelectionSingleton::ObserverType
+ {
+-- 
+2.29.2
+
diff --git a/FreeCAD-test.spec b/FreeCAD-test.spec
index 4c6ca33..e8c6fa8 100644
--- a/FreeCAD-test.spec
+++ b/FreeCAD-test.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package FreeCAD-test
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/FreeCAD.changes b/FreeCAD.changes
index 10dc38e..b40276b 100644
--- a/FreeCAD.changes
+++ b/FreeCAD.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan  4 22:02:50 UTC 2021 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Fix build with latest GCC, add 0001-Gui-skip-ci-fix-Wodr.patch
+- Force-enable C++17, Boost 1.75 requires C++14 at least
+
 -------------------------------------------------------------------
 Sat Nov 28 14:08:01 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
diff --git a/FreeCAD.spec b/FreeCAD.spec
index a034cde..a050b93 100644
--- a/FreeCAD.spec
+++ b/FreeCAD.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package FreeCAD
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -54,6 +54,8 @@ Patch8:         0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch
 Patch9:         fix-smesh-vtk9.patch
 # PATCH-FIX-UPSTREAM
 Patch10:        0001-Fix-ODR-violation-correct-Ui_TaskSketcherGeneral-nam.patch
+# PATCH-FIX-UPSTREAM -- https://github.com/FreeCAD/FreeCAD/commit/6bd39e8a90e65d81
+Patch11:        0001-Gui-skip-ci-fix-Wodr.patch
 
 # Test suite fails on 32bit and I don't want to debug that anymore
 ExcludeArch:    %ix86 %arm ppc s390 s390x
@@ -209,6 +211,7 @@ rm src/3rdparty/Pivy-0.5 -fr
   -DPYTHON_EXECUTABLE=/usr/bin/python3 \
   -DSHIBOKEN_INCLUDE_DIR=/usr/include/shiboken2/ \
   -DPYSIDE_INCLUDE_DIR=/usr/include/PySide2/ \
+  -DBUILD_ENABLE_CXX_STD:STRING="C++17" \
   -DBUILD_QT5=ON \
   -DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \
   -DBUILD_OPENSCAD:BOOL=ON \
diff --git a/fix-smesh-vtk9.patch b/fix-smesh-vtk9.patch
index d3f6e6d..2c664a0 100644
--- a/fix-smesh-vtk9.patch
+++ b/fix-smesh-vtk9.patch
@@ -814,7 +814,7 @@ index fcd044b00f2..f54c24f8618 100644
            for (int i=0; i<npts; i++)
              {
 diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
-index 1fce4b64722..5294aeac021 100644
+index dde2bd824..3acfead65 100644
 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
 +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
 @@ -56,6 +56,11 @@