diff --git a/Makefile b/Makefile
index ff2ba60..b6d7d7e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
 CC?=gcc
-CFLAGS+=-I../libowfat -Wall -pipe -Os # -DWANT_BLACKLIST -DWANT_CLOSED_TRACKER -DWANT_IP_FROM_QUERY_STRING -g -ggdb
-LDFLAGS+=-L../libowfat/ -lowfat -s -lm
+FEATURES=-DWANT_IP_FROM_QUERY_STRING #-DWANT_BLACKLIST -DWANT_CLOSED_TRACKER
+#DEBUG_OPTS=-g -ggdb -pg # -fprofile-arcs -ftest-coverage
+DEBUG_OPTS=-s -Os
+CFLAGS+=-I../libowfat -Wall -pipe
+LDFLAGS+=-L../libowfat/ -lowfat -lm
 
 HEADERS=trackerlogic.h scan_urlencoded_query.h
 SOURCES=opentracker.c trackerlogic.c scan_urlencoded_query.c
 
 opentracker: $(SOURCES) $(HEADERS)
-	$(CC) $(SOURCES) -o opentracker $(CFLAGS) $(LDFLAGS)
+	$(CC) $(SOURCES) -o opentracker $(CFLAGS) $(FEATURES) $(DEBUG_OPTS) $(LDFLAGS)
 
 clean:
 	rm -rf opentracker