Index: cdcc/Makefile.in
--- cdcc/Makefile.in.orig	2007-10-25 16:06:01 +0200
+++ cdcc/Makefile.in	2009-01-10 20:49:04 +0100
@@ -45,7 +45,7 @@
 
 @MAKE_DOT@ifndef NO_SUID
 # cdcc needs to be SUID to read the server passwords
-BINMODE	=4$(DCC_MODE)
-BINOWN	=@DCCSUID@
+BINMODE	=$(DCC_MODE)
+BINOWN	=$(DCC_SUID)
 @MAKE_DOT@endif
 @MAKE_INC2@
Index: configure
--- configure.orig	2009-01-09 17:35:38 +0100
+++ configure	2009-01-10 20:49:04 +0100
@@ -1098,7 +1098,7 @@
 	appendvar PTHREAD_LDFLAGS -pthread
 	if test -s /usr/lib/libc_r.a; then
 	    # use libc_r on ancient versions
-	    appendvar PTHREAD_LIBS -lc_r
+	    : # appendvar PTHREAD_LIBS -lc_r
 	fi
 	;;
     Darwin)
@@ -2916,6 +2916,13 @@
     SENDMAIL_EVAL="$SENDMAIL"
     with_sendmail=yes
 fi
+if test -n "$SENDMAIL" -a "$SENDMAIL" != "no"; then
+    if test -f $SENDMAIL/include/milter/mfapi.h -a -f $SENDMAIL/lib/libmilter.a; then
+        SENDMAIL_OBJ=$SENDMAIL/lib
+        SENDMAIL_OBJ_EVAL=$SENDMAIL_OBJ
+        SENDMAIL_LIB=$SENDMAIL_OBJ/libmilter.a
+    fi
+fi
 if test -z "$SENDMAIL"; then
     # prefer a parallel ../sendmail directory
     DEPTH=.
@@ -3473,7 +3480,7 @@
 	mancat=man
 	MAN8='dcc.8 $(SUBDIR_MAN8)'
 	MAN8INST=''
-	USE_DCCMANINSTALL='# do not use dccmaninstall'
+	USE_DCCMANINSTALL='maninstall:dccmaninstall'
 	;;
     DragonFly)
 	# default to /usr/local/man/man8 and use nroff files, possibly
Index: dccm/dccm.c
--- dccm/dccm.c.orig	2008-12-06 00:22:30 +0100
+++ dccm/dccm.c	2009-01-10 20:49:04 +0100
@@ -39,7 +39,7 @@
  * Rhyolite Software DCC 1.3.101-1.238 $Revision: 1.8 $
  */
 
-#include "libmilter/mfapi.h"
+#include "milter/mfapi.h"
 #include "cmn_defs.h"
 
 #undef NEW_MFAPI
Index: dccproc/Makefile.in
--- dccproc/Makefile.in.orig	2007-10-25 16:02:00 +0200
+++ dccproc/Makefile.in	2009-01-10 20:49:04 +0100
@@ -45,7 +45,7 @@
 
 @MAKE_DOT@ifndef NO_SUID
 # dccproc needs to be SUID to read the server passwords
-BINMODE	=4$(DCC_MODE)
-BINOWN	=@DCCSUID@
+BINMODE	=$(DCC_MODE)
+BINOWN	=$(DCC_SUID)
 @MAKE_DOT@endif
 @MAKE_INC2@
Index: dccsight/Makefile.in
--- dccsight/Makefile.in.orig	2007-10-25 16:21:01 +0200
+++ dccsight/Makefile.in	2009-01-10 20:49:04 +0100
@@ -46,7 +46,7 @@
 
 @MAKE_DOT@ifndef NO_SUID
 # dccsight needs to be SUID to read the server passwords
-BINMODE	=4$(DCC_MODE)
-BINOWN	=@DCCSUID@
+BINMODE	=$(DCC_MODE)
+BINOWN	=$(DCC_SUID)
 @MAKE_DOT@endif
 @MAKE_INC2@
Index: homedir/Makefile.in
--- homedir/Makefile.in.orig	2008-10-19 17:53:22 +0200
+++ homedir/Makefile.in	2009-01-10 20:49:04 +0100
@@ -42,7 +42,7 @@
 @MAKE_PROG@
 @MAKE_INC2@
 
-HINST	=$(INSTALL) -c $(SET_DCCOWN)
+HINST	=$(INSTALL) -c
 HD	=@installroot@$(DCC_HOMEDIR)
 MAP	=$(HD)/map@configsuffix@
 MAPTXT	=$(HD)/map.txt@configsuffix@
@@ -76,7 +76,7 @@
 		$(HINST) -m 644 $$nm $(HD)/$${nm}@configsuffix@; fi; done
 	if test -s $(UPFILE); then\
 	    $(HINST) -m 600 $(UPFILE) $(HD)/$(UPFILE);\
-	    set +e; chown @DCCSUID@ $(HD)/$(UPFILE); fi
+	    set +e; fi
 	if test -n '@configsuffix@' || test ! -f $(HD)/ids -a ! -f $(HD)/map\
 				 -a ! -f $(HD)/map.txt; then\
 	    umask 077; PASSWD=`$(RND)`;\
@@ -86,7 +86,7 @@
 	    sh fix-map -c $(CDCC) -m $(MAP) -h $(HD);\
 	    echo '# map.txt is merely the output of `cdcc info`' >$(MAPTXT);\
 	    $(CDCC) -qh$(HD) "file $(MAP); info" >>$(MAPTXT);\
-	    set +e; chown @DCCSUID@ $(MAPTXT) $(MAP) $(IDS);\
+	    set +e; \
 	else\
 	    sh fix-map -c $(CDCC) -m $(MAP) -h $(HD);\
 	fi
Index: thrlib/cmn.c
--- thrlib/cmn.c.orig	2008-12-06 00:21:11 +0100
+++ thrlib/cmn.c	2009-01-10 20:49:04 +0100
@@ -646,7 +646,7 @@
 	LOG_CMN_CAPTION(cwp, DCC_LOG_TRN_MSG_CR);
 	cwp->log_size = MAX_LOG_SIZE+1;
 #else
-	log_write(&wp->cw, buf, buflen);
+	log_write(cwp, buf, buflen);
 #endif
 }