diff --git a/.clang-format b/.clang-format
index 14203ffdc7..394707c91a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -30,7 +30,7 @@ BreakBeforeBraces: Whitesmiths
 #   SplitEmptyNamespace: false
 
 AccessModifierOffset: -4
-AlignAfterOpenBracket: true
+AlignAfterOpenBracket: Align
 AlignTrailingComments: false
 AllowShortBlocksOnASingleLine: Empty
 AllowShortEnumsOnASingleLine: true
diff --git a/src/script_opt/ZAM/ZBody.cc b/src/script_opt/ZAM/ZBody.cc
index b58960ad36..aa6efde064 100644
--- a/src/script_opt/ZAM/ZBody.cc
+++ b/src/script_opt/ZAM/ZBody.cc
@@ -313,9 +313,11 @@ ValPtr ZBody::DoExec(Frame* f, int start_pc, StmtFlowType& flow)
 			case OP_NOP:
 				break;
 
-// These must stay in this order or the build fails.
+				// These must stay in this order or the build fails.
+				// clang-format off
 #include "ZAM-EvalMacros.h"
 #include "ZAM-EvalDefs.h"
+				// clang-format on
 
 			default:
 				reporter->InternalError("bad ZAM opcode");