diff --git a/Makefile b/Makefile
index d8641d50..b5e3538d 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ TARGET_TRIPLET=i686-pc-toaru
 CC=$(TARGET_TRIPLET)-gcc
 AR=$(TARGET_TRIPLET)-ar
 AS=$(TARGET_TRIPLET)-as
-CFLAGS= -O3 -s -std=gnu99 -I. -Iapps -pipe -mmmx -msse -msse2 -fplan9-extensions -Wall -Wextra -Wno-unused-parameter
+CFLAGS= -O2 -s -std=gnu99 -I. -Iapps -pipe -mmmx -msse -msse2 -fplan9-extensions -Wall -Wextra -Wno-unused-parameter
 
 ##
 # C library objects from libc/ C sources (and setjmp, which is assembly)
diff --git a/util/auto-dep.py b/util/auto-dep.py
index 4b69ee28..fb94c637 100755
--- a/util/auto-dep.py
+++ b/util/auto-dep.py
@@ -6,7 +6,7 @@ import sys
 
 import subprocess
 
-cflags = "-O3 -g -std=gnu99 -I. -Iapps -pipe -mmmx -msse -msse2 -fplan9-extensions -Wall -Wextra -Wno-unused-parameter"
+cflags = "-O2 -g -std=gnu99 -I. -Iapps -pipe -mmmx -msse -msse2 -fplan9-extensions -Wall -Wextra -Wno-unused-parameter"
 
 class Classifier(object):