--- Makefile.orig	2003-06-05 03:01:45.000000000 +0200
+++ Makefile	2010-03-12 18:53:17.000000000 +0100
@@ -117,16 +117,11 @@
 # Compilation definitions.
 # ----------------------------------------------------------------------
 
-DEBUGDEFS = -DDEBUG
 
 DEFS = $(CONFIGDEFS) $(DEBUGDEFS) $(SYSDEFS) $(INCLUDES)
 
-COPTS = -pipe
 
-COPTIM = -O2
-COPTIM = -O
 
-CDEBUG = -g
 
 # GCC lint-like warnings -- any warnings are likely bugs in the
 # platform headers or in gcc itself....
@@ -139,7 +134,6 @@
  -Wswitch \
  -Wcomment \
  -Wcast-qual \
- -Wid-clash-30 \
  -Wpointer-arith \
  -Wshadow
 #endif
@@ -147,7 +141,6 @@
 #if $(__GNULD__) >= 1
 GNULDWARNFLAGS = -W \
  -Wall \
- -Wid-clash-30
 #endif
 
 #if $(__GNUC__) >= 2
@@ -169,7 +162,7 @@
 #endif
 
 CPPFLAGS = $(DEFS)
-CFLAGS = $(COPTS) $(CDEBUG) $(COPTIM) $(GCCWARNFLAGS) $(GCC2WARNFLAGS) $(GCC3WARNFLAGS)
+CFLAGS += $(GCCWARNFLAGS) $(GCC2WARNFLAGS) $(GCC3WARNFLAGS)
 
 # Select your favorite compiler if make doesn't already know it...
 #if defined(next)
@@ -250,7 +243,7 @@
 # Unfortunately SunOS-5.9 has only libresolv.so !!!
 #
 #if defined(NEED_LIBRESOLV) && !defined(sunos5.x) && !(BIND-8.4.x)
-LDFLAGS = -static $(GNULDWARNFLAGS)
+LDFLAGS += $(GNULDWARNFLAGS)
 #else
 #LDFLAGS = $(GNULDWARNFLAGS)
 #endif
@@ -294,7 +287,7 @@
 # ----------------------------------------------------------------------
 
 BINOWN = root
-BINGRP = staff
+BINGRP = root
 BINMODE = 755
 #STRIPFLAG = -s