--- Makefile.orig	2010-01-03 15:26:42.000000000 +0100
+++ Makefile	2010-01-05 10:32:00.000000000 +0100
@@ -2,7 +2,6 @@
 SBINDIR=/usr/sbin/
 BINDIR=/usr/bin/
 CONFIGDIR="/etc/powerdns/"
-OPTFLAGS?=-O3
 CXXFLAGS:= $(CXXFLAGS) -Wall -DBOOST_SP_DISABLE_THREADS $(OPTFLAGS) $(PROFILEFLAGS)
 CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS)
 LINKCC=$(CXX)
@@ -41,10 +40,10 @@
 ifeq ($(STATIC),semi)
 	STATICFLAGS=-Wl,-Bstatic -lstdc++ $(LUALIBS) -lgcc -Wl,-Bdynamic -static-libgcc -lm -lc
 	LINKCC=$(CC)
-	LDFLAGS += malloc.o -ldl -lm
+	LDFLAGS += malloc.o -lm
 else
 ifeq ($(STATIC),full)
-	STATICFLAGS=-lstdc++ $(LUALIBS) -ldl -lm -static 
+	STATICFLAGS=-lstdc++ $(LUALIBS) -lm -static 
 	LINKCC=$(CC)
 else
 	LDFLAGS += malloc.o $(LUALIBS)
@@ -72,16 +71,14 @@
 	 fi
 
 install: all
-	-mkdir -p $(DESTDIR)/$(SBINDIR)
 	mv pdns_recursor $(DESTDIR)/$(SBINDIR)
 	strip $(DESTDIR)/$(SBINDIR)/pdns_recursor
-	mkdir -p $(DESTDIR)/$(BINDIR)
 	mv rec_control $(DESTDIR)/$(BINDIR)
 	strip $(DESTDIR)/$(BINDIR)/rec_control
 	-mkdir -p $(DESTDIR)/$(CONFIGDIR)
 	$(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist
-	-mkdir -p $(DESTDIR)/usr/share/man/man1
-	cp pdns_recursor.1 rec_control.1 $(DESTDIR)/usr/share/man/man1
+	mv pdns_recursor.1 pdns_recursor.8
+	mv rec_control.1 rec_control.8
 	$(OS_SPECIFIC_INSTALL)	
 
 clean:
