diff --git a/tools/install/win/build-cross.bat b/tools/install/win/build-cross.bat
index 50926df2ed..6addba4e67 100644
--- a/tools/install/win/build-cross.bat
+++ b/tools/install/win/build-cross.bat
@@ -99,8 +99,8 @@ SET FPCFPMAKE=%COMPILER%
 :: rebuild the rtl without WPO information
 %MAKEEXE% rtl_clean PP=%COMPILER%
 :: 271 needs packages too
-%MAKEEXE% rtl packages PP=%COMPILER% OPT="-Ur -CX -OoNOSTACKFRAME"
-%MAKEEXE% utils PP=%COMPILER% OPT="-Ur -CX -XX -Xs -OoNOSTACKFRAME" DATA2INC=%FPCGITDIR%\fpcsrc\utils\data2inc
+%MAKEEXE% rtl packages PP=%COMPILER% OPT="-Ur -CX"
+%MAKEEXE% utils PP=%COMPILER% OPT="-Ur -CX -XX -Xs" DATA2INC=%FPCGITDIR%\fpcsrc\utils\data2inc
 
 :: do NOT clean => or 2.7.1 will try to build a fpmake.exe for arm-wince (and fail)
 
@@ -122,13 +122,13 @@ SET BINUTILSPREFIX=%FPCFULLTARGET%-
 
 if NOT [%SKIPCROSS%] == [] GOTO NOCROSS
 
-%MAKEEXE% compiler OPT="-OoNOSTACKFRAME" FPC=%COMPILER% PPC_TARGET=%TARGETCPU% EXENAME=%PPCNAME%
+%MAKEEXE% compiler FPC=%COMPILER% PPC_TARGET=%TARGETCPU% EXENAME=%PPCNAME%
 IF ERRORLEVEL 1 GOTO CLEANUP
 SET COMPILER=%FPCGITDIR%\fpcsrc\compiler\%PPCNAME%
 SET CPU_TARGET=%TARGETCPU%
 SET OS_TARGET=%TARGETOS%
 
-%MAKEEXE% rtl packages OPT="-OoNOSTACKFRAME" FPC=%COMPILER% 
+%MAKEEXE% rtl packages FPC=%COMPILER% 
 IF ERRORLEVEL 1 GOTO CLEANUP
 
 :NOCROSS
diff --git a/tools/install/win/build-fpc.bat b/tools/install/win/build-fpc.bat
index 7be0a678a1..e37a9db694 100644
--- a/tools/install/win/build-fpc.bat
+++ b/tools/install/win/build-fpc.bat
@@ -31,9 +31,9 @@ FOR /F %%L IN ('%COMPILER% -iV') DO SET FPCVERSION=%%L
 FOR /F %%L IN ('%COMPILER% -iW') DO SET FPCFULLVERSION=%%L
 
 %MAKEEXE% rtl_clean PP=%COMPILER% >> %LOGFILE%
-%MAKEEXE% rtl packages PP=%COMPILER% OPT="-Ur -CX -OoNOSTACKFRAME" >> %LOGFILE%
+%MAKEEXE% rtl packages PP=%COMPILER% OPT="-Ur -CX" >> %LOGFILE%
 
-%MAKEEXE% utils PP=%COMPILER% OPT="-CX -XX -Xs -OoNOSTACKFRAME" DATA2INC=%SOURCE_DIR%\utils\data2inc >> %LOGFILE%
+%MAKEEXE% utils PP=%COMPILER% OPT="-CX -XX -Xs" DATA2INC=%SOURCE_DIR%\utils\data2inc >> %LOGFILE%
 
 SET INSTALL_BASE=%BUILDDIR%\fpc\%FPCVERSION%
 SET INSTALL_BINDIR=%INSTALL_BASE%\bin\%FPCFULLTARGET%