diff --git a/.gitignore b/.gitignore
index 8b5f62d..e90f3a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /galera-26.4.4.tar.gz
 /galera-26.4.5.tar.gz
 /galera-26.4.6.tar.gz
+/galera-26.4.7.tar.gz
diff --git a/galera.spec b/galera.spec
index d1e0c0c..f301f45 100644
--- a/galera.spec
+++ b/galera.spec
@@ -1,6 +1,6 @@
 Name:           galera
-Version:        26.4.6
-Release:        3%{?dist}
+Version:        26.4.7
+Release:        1%{?dist}
 Summary:        Synchronous multi-master wsrep provider (replication engine)
 
 License:        GPLv2
@@ -47,16 +47,15 @@ replication engine see http://www.codership.com.
 #   --warn=all
 #   debug=0
 
-# Workaround for FTBFS on F33+
-#   https://bugzilla.redhat.com/show_bug.cgi?id=1863592
-# Reported upstream:
-#   https://github.com/codership/galera/issues/577
-# Update for 26.4.6: The strict_build_flags still FTBFS on armv7hl and i686
-%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
-scons-3 %{?_smp_mflags} strict_build_flags=0
-%else
+# Workaround for version 26.4.7
+export CXXFLAGS="$CXXFLAGS -Wno-error=format-extra-args"
+# ... and for 32 bit arches
+export CXXFLAGS="$CXXFLAGS -Wno-error=format"
+export CFLAGS="$CFLAGS -Wno-error=format-extra-args -Wno-error=format"
+# end of workaroound
+
 scons-3 %{?_smp_mflags} strict_build_flags=1
-%endif
+
 
 %install
 install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service
@@ -97,6 +96,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
 
 
 %changelog
+* Tue Feb 23 2021 Michal Schorm <mschorm@redhat.com> - 26.4.7-1
+- Rebase to 26.4.7
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26.4.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 3933c95..475b61a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (galera-26.4.6.tar.gz) = 512b6f226ae0a4da9b02df6edd22a41eb126b89b1ef5757c25c5815e4c9fca6ae5b7297a6c27ba1a14e88ccc70a5f513c18c750e3fa46f79b221bb77e269729e
+SHA512 (galera-26.4.7.tar.gz) = 6c5016aca151c4560db65bed309d8381080546030f003a5aa1177d68685eabbce44dfc2551db8756206831a898659b26d0904a48336b8ba22c0106260577543e