diff --git a/makefile b/makefile
index 9c34848..b1e505c 100644
--- a/makefile
+++ b/makefile
@@ -12,9 +12,9 @@ OBJS += unixInit.o
 include common.mk
 
 CXXFLAGS += `sdl2-config --cflags` -DVERSION=$(VERSION) -DREVISION=$(REVISION) -DDATA_DIR=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\"
-CXXFLAGS += -Wall -Wempty-body -ansi -pedantic -Werror -Wstrict-prototypes
+CXXFLAGS += -ansi -pedantic
+CXXFLAGS += -Wall -Wempty-body -Werror -Wstrict-prototypes -Werror=maybe-uninitialized
 CXXFLAGS += -g -lefence
-CXXFLAGS += -O2 -Wno-unused-result
 
 LFLAGS := `sdl2-config --libs` -lSDL2_mixer -lSDL2_image -lSDL2_ttf -lm