diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp
index 670390d6c..26a57ec14 100644
--- a/src/libcalamares/PythonHelper.cpp
+++ b/src/libcalamares/PythonHelper.cpp
@@ -26,8 +26,13 @@
 #include <QFileInfo>
 
 #undef slots
+#include "utils/boost-warnings.h"
 #include <boost/python.hpp>
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 namespace bp = boost::python;
 
 namespace CalamaresPython
diff --git a/src/libcalamares/PythonHelper.h b/src/libcalamares/PythonHelper.h
index 667a08614..9035ba6d4 100644
--- a/src/libcalamares/PythonHelper.h
+++ b/src/libcalamares/PythonHelper.h
@@ -25,10 +25,16 @@
 #include <QStringList>
 
 #undef slots
+#include "utils/boost-warnings.h"
+
 #include <boost/python/dict.hpp>
 #include <boost/python/list.hpp>
 #include <boost/python/object.hpp>
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 namespace CalamaresPython
 {
 
diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index 610003492..7b65e979c 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -32,8 +32,13 @@
 #include <QStandardPaths>
 
 #undef slots
+#include "utils/boost-warnings.h"
 #include <boost/python.hpp>
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 namespace bp = boost::python;
 
 static int
diff --git a/src/libcalamares/utils/boost-warnings.h b/src/libcalamares/utils/boost-warnings.h
new file mode 100644
index 000000000..65a66b0f6
--- /dev/null
+++ b/src/libcalamares/utils/boost-warnings.h
@@ -0,0 +1,8 @@
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#pragma clang diagnostic ignored "-Wextra-semi-stmt"
+#pragma clang diagnostic ignored "-Wall"
+#endif