diff -ruN courier-imap-4.1.0.orig/imap/Makefile.in courier-imap-4.1.0/imap/Makefile.in
--- courier-imap-4.1.0.orig/imap/Makefile.in	2006-02-26 03:17:07 +1000
+++ courier-imap-4.1.0/imap/Makefile.in	2006-04-29 23:28:04 +1100
@@ -101,7 +101,7 @@
 	proxy.$(OBJEXT)
 pop3login_OBJECTS = $(am_pop3login_OBJECTS)
 SCRIPTS = $(noinst_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I$(includedir)/courier-authlib
 depcomp = $(SHELL) $(top_srcdir)/../depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
diff -ruN courier-imap-4.1.0.orig/maildir/Makefile.am courier-imap-4.1.0/maildir/Makefile.am
--- courier-imap-4.1.0.orig/maildir/Makefile.am	2006-01-30 02:41:37 +1000
+++ courier-imap-4.1.0/maildir/Makefile.am	2006-04-29 23:28:04 +1100
@@ -115,16 +115,16 @@
 	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
 
diff -ruN courier-imap-4.1.0.orig/maildir/Makefile.in courier-imap-4.1.0/maildir/Makefile.in
--- courier-imap-4.1.0.orig/maildir/Makefile.in	2006-01-30 02:43:20 +1000
+++ courier-imap-4.1.0/maildir/Makefile.in	2006-04-29 23:28:04 +1100
@@ -826,16 +826,16 @@
 	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
 
diff -ruN courier-imap-4.1.0.orig/tcpd/Makefile.am courier-imap-4.1.0/tcpd/Makefile.am
--- courier-imap-4.1.0.orig/tcpd/Makefile.am	2006-01-30 02:41:37 +1000
+++ courier-imap-4.1.0/tcpd/Makefile.am	2006-04-29 23:28:04 +1100
@@ -37,14 +37,14 @@
 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
 
 
diff -ruN courier-imap-4.1.0.orig/tcpd/Makefile.in courier-imap-4.1.0/tcpd/Makefile.in
--- courier-imap-4.1.0.orig/tcpd/Makefile.in	2006-01-30 02:43:44 +1000
+++ courier-imap-4.1.0/tcpd/Makefile.in	2006-04-29 23:28:04 +1100
@@ -96,7 +96,7 @@
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --quiet --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	-o $@ $(AM_LDFLAGS) $(LDFLAGS)
 SOURCES = $(libtlsclient_a_SOURCES) $(libcouriertls_la_SOURCES) \
 	$(libspipe_la_SOURCES) $(couriertcpd_SOURCES) \
 	$(couriertls_SOURCES) $(tlscachetest_SOURCES)
@@ -256,15 +256,14 @@
 	../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