diff --git a/calamares-3.2.11-include.patch b/calamares-3.2.11-include.patch
new file mode 100644
index 0000000..bfbcfe2
--- /dev/null
+++ b/calamares-3.2.11-include.patch
@@ -0,0 +1,10 @@
+--- calamares-3.2.11/src/modules/partition/gui/PartitionSplitterWidget.cpp.include	2019-07-06 07:52:35.000000000 +0900
++++ calamares-3.2.11/src/modules/partition/gui/PartitionSplitterWidget.cpp	2020-10-17 19:56:33.680518437 +0900
+@@ -30,6 +30,7 @@
+ 
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QStyleOption>
+ 
diff --git a/calamares.spec b/calamares.spec
index b79d9a7..e829341 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -1,9 +1,3 @@
-%global __cmake_in_source_build 1
-
-# This package depends on automagic byte compilation
-# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
-%global _python_bytecompile_extra 1
-
 #global snapdate 20161119
 #global snaphash 34516e9477b2fd5e9b3e5823350d1efc2099573f
 
@@ -25,7 +19,7 @@
 
 Name:           calamares
 Version:        3.2.11
-Release:        12%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
+Release:        13%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
 Summary:        Installer from a live CD/DVD/USB to disk
 
 License:        GPLv3+
@@ -51,6 +45,10 @@ Patch0:         calamares-3.2.11-default-settings.patch
 # use kdesu instead of pkexec (works around #1171779)
 Patch1:         calamares-3.2.11-kdesu.patch
 
+# Already upstream:
+# https://github.com/calamares/calamares/commit/0e7c984854bcf9b25655e36998606fcbc116d00f
+Patch2:         calamares-3.2.11-include.patch
+
 # Calamares is only supported where live images (and GRUB) are. (#1171380)
 # This list matches the livearches global from anaconda.spec
 ExclusiveArch:  %{ix86} x86_64
@@ -214,11 +212,13 @@ developing custom modules for Calamares.
 # delete backup files so they don't get installed
 rm -f src/modules/*/*.conf.default-settings
 %patch1 -p1 -b .kdesu
+%patch2 -p1 -b .include
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kf5} -DBUILD_TESTING:BOOL=OFF -DWITH_PYTHONQT:BOOL=OFF -DWEBVIEW_FORCE_WEBKIT:BOOL="%{webview_force_webkit}" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" ..
+# Since %%cmake_kf5 forcely undefines %%__cmake_in_source_build, for now explicitly add -B option here
+%{cmake_kf5} -DBUILD_TESTING:BOOL=OFF -DWITH_PYTHONQT:BOOL=OFF -DWEBVIEW_FORCE_WEBKIT:BOOL="%{webview_force_webkit}" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" -B. ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -368,6 +368,12 @@ EOF
 
 
 %changelog
+* Sat Oct 17 2020 Mamoru TASAKA <mtasaka@fedoraproject.org>  - 3.2.11-13
+- Workaround for FTBFS
+  - Workaround for %%cmake_kf5 forcely undefining %%__cmake_in_source_build
+  - Upstream patch for missing header include
+  - Kill python bytecompile for now
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.11-12
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild