diff --git a/reactos/ReactOS-i386.rbuild b/reactos/ReactOS-i386.rbuild
index 44e3511c28a..5bfd52a6177 100644
--- a/reactos/ReactOS-i386.rbuild
+++ b/reactos/ReactOS-i386.rbuild
@@ -28,6 +28,8 @@
 		<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
 		<compilerflag compiler="midl">-m32 --win32</compilerflag>
 		<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
+		<compilerflag compiler="cc,cxx">-fno-set-stack-executable</compilerflag>
+		<compilerflag compiler="cc,cxx">-fno-optimize-sibling-calls</compilerflag>
 		<compilerflag compiler="as">-gstabs+</compilerflag>
 	</group>
 
diff --git a/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak b/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak
index 9769c6d58f2..074d107a262 100644
--- a/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak
+++ b/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak
@@ -9,14 +9,6 @@ CPPFLAG_UNICODE:=-DUNICODE -D_UNICODE
 
 # FIXME: disabled until RosBE stops sucking
 # BUILTIN_CPPFLAGS+= -nostdinc
-BUILTIN_CFLAGS+= -fno-optimize-sibling-calls
-BUILTIN_CXXFLAGS+= -fno-optimize-sibling-calls
-
-# Add -fno-set-stack-executable required for x86/MinGW
-ifneq (,$(filter $(ARCH),amd64 i386))
-	BUILTIN_CFLAGS+= -fno-set-stack-executable
-	BUILTIN_CXXFLAGS+= -fno-set-stack-executable
-endif
 
 #(module, source, dependencies, cflags, output)
 define RBUILD_DEPENDS