-diff -Nur old/courier/cmlm.h new/courier/cmlm.h
---- old/courier/cmlm.h 2001-08-05 20:00:33.000000000 +0000
-+++ new/courier/cmlm.h 2004-10-06 19:10:33.000000000 +0000
-@@ -18,6 +18,7 @@
-
- using namespace std;
-
-+#define SBINDIR "/usr/sbin"
+diff -ur courier-0.64.2.orig//courier/cmlm.h courier-0.64.2/courier/cmlm.h
+--- courier-0.64.2.orig//courier/cmlm.h 2007-03-11 05:44:43.000000000 +0100
++++ courier-0.64.2/courier/cmlm.h 2010-05-08 23:28:42.329517182 +0200
+@@ -22,6 +22,7 @@
+ #include <functional>
+ #include <cctype>
+
++#define SBINDIR "/usr/sbin"
#define TMP "tmp"
#define TMPLOCK "tmp.lock"
-@@ -52,7 +53,7 @@
+@@ -56,7 +57,7 @@
#include "bindir.h"
#define REFORMIME BINDIR "/reformime"
#define MAXRCPTS 20
-diff -Nur old/courier/Makefile.am new/courier/Makefile.am
---- old/courier/Makefile.am 2004-01-11 05:37:59.000000000 +0000
-+++ new/courier/Makefile.am 2004-03-16 18:20:36.000000000 +0000
-@@ -51,7 +51,7 @@
+diff -ur courier-0.64.2.orig//courier/Makefile.am courier-0.64.2/courier/Makefile.am
+--- courier-0.64.2.orig//courier/Makefile.am 2009-12-19 01:59:59.000000000 +0100
++++ courier-0.64.2/courier/Makefile.am 2010-05-08 23:28:42.329517182 +0200
+@@ -49,7 +49,7 @@
extrabin=maildrop lockmail reformail reformime mailbot mimegpg \
imapd makemime deliverquota maildirmake maildiracl maildirkw
-bin_PROGRAMS=cancelmsg mailq sendmail \
+bin_PROGRAMS=cancelmsg mailq \
testmxlookup dotforward \
- couriermlm \
+ couriermlm webmlmd \
courier-config @couriertls@ @EXTRABIN@
-@@ -60,7 +60,7 @@
- authenumerate$(EXEEXT) \
- sharedindexsplit sharedindexinstall
+@@ -63,7 +63,7 @@
+ sbin_SCRIPTS=@SBINSCRIPTS@
+ EXTRA_SCRIPTS=
--sbin_PROGRAMS=courier showconfig showmodules \
-+sbin_PROGRAMS=courier showconfig showmodules sendmail \
+-sbin_PROGRAMS=courier showconfig showmodules aliaslookup \
++sbin_PROGRAMS=courier showconfig showmodules aliaslookup sendmail \
@COURIERLDAPALIASD@ @EXTRASBIN@
sysconf_DATA=pop3d.authpam imapd.authpam webmail.authpam imapd.cnf pop3d.cnf \