--- src/Makefile.upstream	2012-02-27 11:26:33.399816815 +0100
+++ src/Makefile	2012-02-27 11:29:11.478811550 +0100
@@ -1,8 +1,8 @@
 DESTDIR =
-PREFIX = /usr/local
+PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 SHAREDIR = $(PREFIX)/share/imapfilter
-MANDIR = $(PREFIX)/man
+MANDIR = $(PREFIX)/share/man
 
 MYCFLAGS =
 MYLDFLAGS =
@@ -16,7 +16,7 @@
 LIBSSL = -lssl
 LIBCRYPTO = -lcrypto
 
-CFLAGS = -Wall -O -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS) $(MYCFLAGS)
+CFLAGS += -Wall -DCONFIG_SHAREDIR='"$(SHAREDIR)"' $(INCDIRS)
 LDFLAGS = $(LIBDIRS) $(MYLDFLAGS)
 LIBS = -lm $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS)