diff --git a/Makefile b/Makefile
index 3da8ad0528..a3979f2a84 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,7 @@ RM=rm -f
 CC=gcc
 CXX=g++
 CXXFLAGS=$(CFLAGS)
-# NOTFORCHECKIN - restore to -O2
-CLD=g++ -O0 -g -L/usr/local/lib -L/opt/local/lib
+CLD=g++ -O2 -g -L/usr/local/lib -L/opt/local/lib
 
 ifeq ($(OS),osx)
   CLDOSFLAGS=-bind_at_load
@@ -59,7 +58,7 @@ INCLUDE=include
 MDEFINES=-DU2_OS_$(OS) -DU2_OS_ENDIAN_$(ENDIAN) -D U2_LIB=\"$(LIB)\"
 
 # NOTFORCHECKIN - restore -O2
-CFLAGS= -O0 -g -msse3 -ffast-math \
+CFLAGS= -O2 -g -msse3 -ffast-math \
 	-funsigned-char \
 	-I/usr/local/include \
 	-I/opt/local/include \