diff --git a/base/toybox/toybox.conf b/base/toybox/toybox.conf
index 09ecb9b9f..1efbcaa3d 100644
--- a/base/toybox/toybox.conf
+++ b/base/toybox/toybox.conf
@@ -18,8 +18,8 @@ runconf=0
 echo_status "Using CPUS=$SDECFG_PARALLEL_MAX"
 export CPUS=$SDECFG_PARALLEL_MAX
 
-#Tools used to build toybox do not support -Os
-var_remove_regex SYSGCC_WRAPPER_INSERT " " "-Os"
+#Tools used to build toybox do not support -Os or -O2
+var_remove_regex SYSGCC_WRAPPER_INSERT " " "-O.*"
 
 hook_add premake 1 'toybox_config'
 toybox_config() {
@@ -30,6 +30,9 @@ toybox_config() {
 	if pkginstalled binutils; then
 		sed -i -e "s,^CONFIG_STRINGS=y,CONFIG_STRINGS=n," .config
 	fi
+	if pkginstalled patch; then
+		sed -i -e "s,^CONFIG_PATCH=y,CONFIG_PATCH=n," .config
+	fi
 
 	eval $MAKE oldconfig CPUS=$CPUS
 }