diff --git a/.gitignore b/.gitignore
index 5bf3c57ca1a5a1f3524bf2ba86a7edf811dc489e..4023c2c49f5934172aa3e57d178bfba0e6a42ada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ CMakeLists.txt.user
 
 # Backup files
 *~
+*.bak
 
 # Kate
 *.kate-swp
diff --git a/ci/calamaresstyle b/ci/calamaresstyle
index d2ce360bbd97aa27eea035cc4054ca87228a8300..bd715eee185d41edb185462f2c03357536117d33 100755
--- a/ci/calamaresstyle
+++ b/ci/calamaresstyle
@@ -35,7 +35,13 @@ test -n "$CF" || { echo "! No clang-format ($CF_VERSIONS) found in PATH"; exit 1
 test -x "$AS" || { echo "! $AS is not executable."; exit 1 ; }
 test -x "$CF" || { echo "! $CF is not executable."; exit 1 ; }
 
-expr `"$CF" --version | tr -dc '[^.0-9]' | cut  -d . -f 1` '<' 10 > /dev/null ||  { echo "! $CF is version 10 or later, needs different .clang-format" ; exit 1 ; }
+unmangle_clang_format=""
+if expr `"$CF" --version | tr -dc '[^.0-9]' | cut  -d . -f 1` '<' 10 > /dev/null ; then
+	:
+else
+	unmangle_clang_format=$( dirname $0 )/../.clang-format
+	echo "SpaceInEmptyBlock: false" >> "$unmangle_clang_format"
+fi
 
 set -e
 
@@ -65,3 +71,7 @@ if test "x$any_dirs" = "xyes" ; then
 else
 	style_some "$@"
 fi
+
+if test -n "$unmangle_clang_format" ; then
+	sed -i.bak '/^SpaceInEmptyBlock/d' "$unmangle_clang_format"
+fi