diff --git a/Makefile.config b/Makefile.config
index 390eb080..27d62434 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -7,6 +7,9 @@
 CYC_PROFILING ?= 
 #CYC_PROFILING ?= -pg
 
+CYC_GCC_OPT_FLAGS ?= -O2
+#CYC_GCC_OPT_FLAGS ?= -g
+
 OS ?= $(shell uname)
 CC ?= cc
 
@@ -17,8 +20,8 @@ LIBS += -ldl
 endif
 
 # Compiler options
-CFLAGS       ?= $(CYC_PROFILING) -O2 -fPIC -Wall -Iinclude
-COMP_CFLAGS  ?= $(CYC_PROFILING) -O2 -fPIC -Wall -I$(PREFIX)/include -L$(PREFIX)/lib
+CFLAGS       ?= $(CYC_PROFILING) $(CYC_GCC_OPT_FLAGS) -fPIC -Wall -Iinclude
+COMP_CFLAGS  ?= $(CYC_PROFILING) $(CYC_GCC_OPT_FLAGS) -fPIC -Wall -I$(PREFIX)/include -L$(PREFIX)/lib
 # Use these lines instead for debugging or profiling
 #CFLAGS = -g -Wall
 #CFLAGS = -g -pg -Wall