--- courier-imap-4.3.1/imap/Makefile.in.p5	2008-03-23 23:47:09 +1000
+++ courier-imap-4.3.1/imap/Makefile.in	2008-04-27 02:53:51 +1100
@@ -104,7 +104,7 @@ am_pop3login_OBJECTS = pop3login.$(OBJEX
 	proxy.$(OBJEXT)
 pop3login_OBJECTS = $(am_pop3login_OBJECTS)
 SCRIPTS = $(noinst_SCRIPTS)
-DEFAULT_INCLUDES = -I.@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(srcdir) -I. -I$(includedir)/courier-authlib
 depcomp = $(SHELL) $(top_srcdir)/../depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--- courier-imap-4.3.1/maildir/Makefile.am.p5	2007-07-05 12:42:50 +1100
+++ courier-imap-4.3.1/maildir/Makefile.am	2008-04-27 02:53:51 +1100
@@ -114,16 +114,16 @@ mailbot.h: config.status
 	echo '#define MAILBOT "@MAILBOT@"' >mailbot.h
 
 maildirsharedrc.h: config.status
-	echo '#define MAILDIRSHAREDRC "$(sysconfdir)/maildirshared"' >maildirsharedrc.h
+	echo '#define MAILDIRSHAREDRC "$(sysconfdir)/courier-imap/maildirshared"' >maildirsharedrc.h
 
 maildirfilterconfig.h: config.status
-	echo '#define MAILDIRFILTERCONFIG "$(sysconfdir)/maildirfilterconfig"' >maildirfilterconfig.h
+	echo '#define MAILDIRFILTERCONFIG "$(sysconfdir)/courier-imap/maildirfilterconfig"' >maildirfilterconfig.h
 
 autoresponsequota.h: config.status
-	echo '#define AUTORESPONSEQUOTA "$(sysconfdir)/autoresponsesquota"' >autoresponsequota.h
+	echo '#define AUTORESPONSEQUOTA "$(sysconfdir)/courier-imap/autoresponsesquota"' >autoresponsequota.h
 
 quotawarnmsg.h: config.status
-	echo '#define QUOTAWARNMSG "$(sysconfdir)/quotawarnmsg"' >quotawarnmsg.h
+	echo '#define QUOTAWARNMSG "$(sysconfdir)/courier-imap/quotawarnmsg"' >quotawarnmsg.h
 maildir.libdeps: config.status
 	echo @LIBFAM@ >maildir.libdeps
 
--- courier-imap-4.3.1/maildir/Makefile.in.p5	2007-11-19 03:23:04 +1000
+++ courier-imap-4.3.1/maildir/Makefile.in	2008-04-27 02:53:51 +1100
@@ -860,16 +860,16 @@ mailbot.h: config.status
 	echo '#define MAILBOT "@MAILBOT@"' >mailbot.h
 
 maildirsharedrc.h: config.status
-	echo '#define MAILDIRSHAREDRC "$(sysconfdir)/maildirshared"' >maildirsharedrc.h
+	echo '#define MAILDIRSHAREDRC "$(sysconfdir)/courier-imap/maildirshared"' >maildirsharedrc.h
 
 maildirfilterconfig.h: config.status
-	echo '#define MAILDIRFILTERCONFIG "$(sysconfdir)/maildirfilterconfig"' >maildirfilterconfig.h
+	echo '#define MAILDIRFILTERCONFIG "$(sysconfdir)/courier-imap/maildirfilterconfig"' >maildirfilterconfig.h
 
 autoresponsequota.h: config.status
-	echo '#define AUTORESPONSEQUOTA "$(sysconfdir)/autoresponsesquota"' >autoresponsequota.h
+	echo '#define AUTORESPONSEQUOTA "$(sysconfdir)/courier-imap/autoresponsesquota"' >autoresponsequota.h
 
 quotawarnmsg.h: config.status
-	echo '#define QUOTAWARNMSG "$(sysconfdir)/quotawarnmsg"' >quotawarnmsg.h
+	echo '#define QUOTAWARNMSG "$(sysconfdir)/courier-imap/quotawarnmsg"' >quotawarnmsg.h
 maildir.libdeps: config.status
 	echo @LIBFAM@ >maildir.libdeps
 
--- courier-imap-4.3.1/tcpd/Makefile.am.p5	2007-11-05 15:14:03 +1000
+++ courier-imap-4.3.1/tcpd/Makefile.am	2008-04-27 02:53:51 +1100
@@ -39,14 +39,14 @@ couriertcpd_DEPENDENCIES= libspipe.la \
 couriertcpd_t=@NETLIBS@ @soxdep@
 
 couriertcpd_LDADD= libspipe.la \
-	../rfc1035/librfc1035.a \
-        @dblibrary@ \
-	../liblock/liblock.la\
-        ../numlib/libnumlib.la\
-        ../waitlib/libwaitlib.a\
-	../soxwrap/libsoxwrap.a\
+	../rfc1035/librfc1035.a ../liblock/liblock.la \
+	../waitlib/libwaitlib.a ../soxwrap/libsoxwrap.a \
 	../md5/libmd5.la ../random128/librandom128.la \
-	@LIBGDBM@ @LIBDB@ $(couriertcpd_t:%=-Wl,%)
+	../numlib/libnumlib.la \
+	@dblibrary@ \
+	$(couriertcpd_t:%=-Wl, %) \
+	@LIBGDBM@ @LIBDB@ 
+
 couriertcpd_LDFLAGS=-static
 
 
--- courier-imap-4.3.1/tcpd/Makefile.in.p5	2007-11-19 03:24:20 +1000
+++ courier-imap-4.3.1/tcpd/Makefile.in	2008-04-27 02:55:47 +1100
@@ -100,8 +100,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) -o $@ $(AM_LDFLAGS) \
+	$(LDFLAGS)
 SOURCES = $(libcouriertls_la_SOURCES) \
 	$(libcouriertlsgnutls_la_SOURCES) \
 	$(libcouriertlsopenssl_la_SOURCES) $(libspipe_la_SOURCES) \
@@ -277,15 +277,14 @@ couriertcpd_DEPENDENCIES = libspipe.la \
 	../md5/libmd5.la ../random128/librandom128.la
 
 couriertcpd_t = @NETLIBS@ @soxdep@
-couriertcpd_LDADD = libspipe.la \
-	../rfc1035/librfc1035.a \
-        @dblibrary@ \
-	../liblock/liblock.la\
-        ../numlib/libnumlib.la\
-        ../waitlib/libwaitlib.a\
-	../soxwrap/libsoxwrap.a\
+couriertcpd_LDADD= libspipe.la \
+	../rfc1035/librfc1035.a ../liblock/liblock.la \
+	../waitlib/libwaitlib.a ../soxwrap/libsoxwrap.a \
 	../md5/libmd5.la ../random128/librandom128.la \
-	@LIBGDBM@ @LIBDB@ $(couriertcpd_t:%=-Wl,%)
+	../numlib/libnumlib.la \
+	@dblibrary@ \
+	$(couriertcpd_t:%=-Wl, %) \
+	@LIBGDBM@ @LIBDB@ 
 
 couriertcpd_LDFLAGS = -static
 tlscachetest_SOURCES = tlscachetest.c