diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 31c3eb72c8..2ef5594a50 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -115,14 +115,12 @@ rule ArchitectureSetup architecture
 	# warning flags
 	HAIKU_WARNING_CCFLAGS_$(architecture) = -Wall
 		-Wno-multichar
-		-Wpointer-arith -Wsign-compare
-		-Wmissing-prototypes 
-		-Wcast-align -Wno-error=cast-align ;
+		-Wpointer-arith -Wsign-compare -Wcast-align
+		-Wmissing-prototypes ;
 	HAIKU_WARNING_C++FLAGS_$(architecture) = -Wall
 		-Wno-multichar
-		-Wpointer-arith -Wsign-compare
-		-Wno-ctor-dtor-privacy -Woverloaded-virtual
-		-Wcast-align -Wno-error=cast-align ;
+		-Wpointer-arith -Wsign-compare -Wcast-align
+		-Wno-ctor-dtor-privacy -Woverloaded-virtual ;
 
 	# disable some Clang warnings that are not very useful
 	if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
@@ -141,6 +139,8 @@ rule ArchitectureSetup architecture
 		HAIKU_WERROR_FLAGS_$(architecture) += -Wno-error=unused-but-set-variable
 			-Wno-error=deprecated -Wno-error=deprecated-declarations
 			-Wno-error=cpp -Wno-error=trigraphs ;
+		# But this one can stay.
+		HAIKU_WERROR_FLAGS_$(architecture) += -Wno-error=cast-align ;
 	}
 
 	# debug flags