diff --git a/Makefile b/Makefile
index 949e63e..a4beaf5 100644
--- a/Makefile
+++ b/Makefile
@@ -13,44 +13,43 @@ CC?=gcc
 # LIBOWFAT_LIBRARY=$(PREFIX)/lib
 
 # Debug flavour
-PREFIX?=..
-LIBOWFAT_HEADERS=$(PREFIX)/libowfat
+PREFIX?=/usr
+LIBOWFAT_HEADERS=$(PREFIX)/include/libowfat
 LIBOWFAT_LIBRARY=$(PREFIX)/libowfat
 
 BINDIR?=$(PREFIX)/bin
-STRIP?=strip
-
-#FEATURES+=-DWANT_V6
-
-#FEATURES+=-DWANT_ACCESSLIST_BLACK
-#FEATURES+=-DWANT_ACCESSLIST_WHITE
-
-#FEATURES+=-DWANT_SYNC_LIVE
-#FEATURES+=-DWANT_IP_FROM_QUERY_STRING
-#FEATURES+=-DWANT_COMPRESSION_GZIP
-#FEATURES+=-DWANT_COMPRESSION_GZIP_ALWAYS
-#FEATURES+=-DWANT_LOG_NETWORKS
-#FEATURES+=-DWANT_RESTRICT_STATS
-#FEATURES+=-DWANT_IP_FROM_PROXY
-#FEATURES+=-DWANT_FULLLOG_NETWORKS
-#FEATURES+=-DWANT_LOG_NUMWANT
-#FEATURES+=-DWANT_MODEST_FULLSCRAPES
-#FEATURES+=-DWANT_SPOT_WOODPECKER
-#FEATURES+=-DWANT_SYSLOGS
-#FEATURES+=-DWANT_DEV_RANDOM
-FEATURES+=-DWANT_FULLSCRAPE
+
+#BUILD_FEATURES+=-DWANT_V6
+
+#BUILD_FEATURES+=-DWANT_ACCESSLIST_BLACK
+#BUILD_FEATURES+=-DWANT_ACCESSLIST_WHITE
+
+#BUILD_FEATURES+=-DWANT_SYNC_LIVE
+#BUILD_FEATURES+=-DWANT_IP_FROM_QUERY_STRING
+#BUILD_FEATURES+=-DWANT_COMPRESSION_GZIP
+#BUILD_FEATURES+=-DWANT_COMPRESSION_GZIP_ALWAYS
+#BUILD_FEATURES+=-DWANT_LOG_NETWORKS
+#BUILD_FEATURES+=-DWANT_RESTRICT_STATS
+#BUILD_FEATURES+=-DWANT_IP_FROM_PROXY
+#BUILD_FEATURES+=-DWANT_FULLLOG_NETWORKS
+#BUILD_FEATURES+=-DWANT_LOG_NUMWANT
+#BUILD_FEATURES+=-DWANT_MODEST_FULLSCRAPES
+#BUILD_FEATURES+=-DWANT_SPOT_WOODPECKER
+#BUILD_FEATURES+=-DWANT_SYSLOGS
+#BUILD_FEATURES+=-DWANT_DEV_RANDOM
+BUILD_FEATURES+=-DWANT_FULLSCRAPE
 
 # Is enabled on BSD systems by default in trackerlogic.h
 # on Linux systems you will need -lbds
-#FEATURES+=-DWANT_ARC4RANDOM
+#BUILD_FEATURES+=-DWANT_ARC4RANDOM
 
-#FEATURES+=-D_DEBUG_HTTPERROR
+#BUILD_FEATURES+=-D_DEBUG_HTTPERROR
 
 OPTS_debug=-D_DEBUG -g -ggdb # -pg -fprofile-arcs -ftest-coverage
-OPTS_production=-O3
+OPTS_production=
 
 CFLAGS+=-I$(LIBOWFAT_HEADERS) -Wall -pipe -Wextra #-ansi -pedantic
-LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -pthread -lpthread -lz
+LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -lpthread -lz
 #LDFLAGS+=-lbsd
 
 BINARY =opentracker
@@ -59,31 +58,21 @@ SOURCES=opentracker.c trackerlogic.c scan_urlencoded_query.c ot_mutex.c ot_stats
 SOURCES_proxy=proxy.c ot_vector.c ot_mutex.c
 
 OBJECTS = $(SOURCES:%.c=%.o)
-OBJECTS_debug = $(SOURCES:%.c=%.debug.o)
 OBJECTS_proxy = $(SOURCES_proxy:%.c=%.o)
-OBJECTS_proxy_debug = $(SOURCES_proxy:%.c=%.debug.o)
 
-.SUFFIXES: .debug.o .o .c
+.SUFFIXES: .o .c
 
-all: $(BINARY) $(BINARY).debug
+all: $(BINARY)
 
-CFLAGS_production = $(CFLAGS) $(OPTS_production) $(FEATURES)
-CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
+CFLAGS_production = $(CFLAGS) $(OPTS_production) $(BUILD_FEATURES)
+#CFLAGS_production += $(OPTS_debug)
 
 $(BINARY): $(OBJECTS) $(HEADERS)
 	$(CC) -o $@ $(OBJECTS) $(LDFLAGS)
-	$(STRIP) $@
-$(BINARY).debug: $(OBJECTS_debug) $(HEADERS)
-	$(CC) -o $@ $(OBJECTS_debug) $(LDFLAGS)
 proxy: $(OBJECTS_proxy) $(HEADERS)
 	$(CC) -o $@ $(OBJECTS_proxy) $(CFLAGS_production) $(LDFLAGS)
-proxy.debug: $(OBJECTS_proxy_debug) $(HEADERS)
-	$(CC) -o $@ $(OBJECTS_proxy_debug) $(LDFLAGS)
-
-.c.debug.o : $(HEADERS)
-	$(CC) -c -o $@ $(CFLAGS_debug) $(<:.debug.o=.c)
 
-.c.o : $(HEADERS)
+.c.o :
 	$(CC) -c -o $@ $(CFLAGS_production) $<
 
 clean: