diff --git a/Makefile b/Makefile
index 2ec10b8..e6f5f06 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ repos = templates.rpo
 executables = parse termemu ntester encrypt decrypt stm-server stm
 
 CXX = g++
-CXXFLAGS = -g --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-implicit-templates -fno-default-inline -pipe -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500 -D_GNU_SOURCE -D_BSD_SOURCE
+CXXFLAGS = -g -O2 --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-implicit-templates -fno-default-inline -pipe -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500 -D_GNU_SOURCE -D_BSD_SOURCE
 LIBS = -lutil -lssl -lrt -lm -lprotobuf-lite
 PROTOC = protoc