Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a945d40ec2728e3e6032e61583c0ec375f02a2c2)
+++ introduction/welcome/changelog.xml	(revision 2f473b244e709160ad1ddce322847cee6d5da326)
@@ -11,4 +11,7 @@
 
 <itemizedlist>
+
+<listitem><para>March 11th, 2004 [tushar]: Updated to courier-0.45.0.
+Submitted by Jim Gifford.</para></listitem>
 
 <listitem><para>March 10th, 2004 [tushar]: Added nfs-utils-1.0.6.
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision a945d40ec2728e3e6032e61583c0ec375f02a2c2)
+++ introduction/welcome/credits.xml	(revision 2f473b244e709160ad1ddce322847cee6d5da326)
@@ -174,4 +174,6 @@
 <listitem><para>nfs-utils: <emphasis>Reinhard</emphasis></para></listitem>
 
+<listitem><para>courier: <emphasis>Jim Gifford</emphasis></para></listitem>
+
 </itemizedlist>
 </sect2>
Index: server/mail/courier/courier-config.xml
===================================================================
--- server/mail/courier/courier-config.xml	(revision a945d40ec2728e3e6032e61583c0ec375f02a2c2)
+++ server/mail/courier/courier-config.xml	(revision 2f473b244e709160ad1ddce322847cee6d5da326)
@@ -226,9 +226,9 @@
 
 <para>You will need to copy the file webmail from
-<filename>/usr/sbin/courier/webmail/webmail</filename> to your <filename>cgi-bin
+<filename>/usr/lib/courier/courier/webmail/webmail</filename> to your <filename>cgi-bin
 </filename> directory of your <application>Apache</application>
 server.</para>
 
-<screen><userinput><command>cp -a /usr/sbin/courier/webmail/webmail /var/www/cgi-bin</command></userinput></screen>
+<screen><userinput><command>cp -a /usr/lib/courier/courier/webmail/webmail /var/www/cgi-bin</command></userinput></screen>
 
 <para>You will then need to copy the images to a directory under your
@@ -245,9 +245,9 @@
 
 <para>You will need to copy the file <filename>webadmin</filename> from
-<filename class="directory">/usr/sbin/courier/webmail/webmin</filename>
+<filename class="directory">/usr/lib/courier/webmail/webadmin</filename>
 to your <filename class="directory">cgi-bin </filename> directory of your 
 <application>Apache</application> server.</para>
 
-<screen><userinput><command>cp -a /usr/sbin/courier/webmail/webadmin /var/www/cgi-bin</command></userinput></screen>
+<screen><userinput><command>cp -a /usr/lib/courier/courier/webmail/webadmin /var/www/cgi-bin</command></userinput></screen>
 
 <para><filename>/etc/courier/webadmin/password</filename></para>
Index: server/mail/courier/courier-exp.xml
===================================================================
--- server/mail/courier/courier-exp.xml	(revision a945d40ec2728e3e6032e61583c0ec375f02a2c2)
+++ server/mail/courier/courier-exp.xml	(revision 2f473b244e709160ad1ddce322847cee6d5da326)
@@ -11,5 +11,5 @@
 when <application>Courier</application> is active.</para>
 
-<para><parameter>--libexecdir=/usr/sbin</parameter>: libexecdir contains 
+<para><parameter>--libexecdir=/usr/lib/courier</parameter>: libexecdir contains 
 programs and libraries that cannot be directly executed from the command-line.
 </para>
@@ -23,4 +23,16 @@
 defaults to the subdirectory <filename class="directory">var</filename> in the 
 directory specified by the <option>--prefix</option> option.</para>
+
+<para><option>--with-paranoid-smtpext</option>:be paranoid when negotiating Courier-specific
+ESMTP extensions with remote servers. The <application>Courier</application> mail server
+defines and implements certain experimental ESMTP extensions: XVERP and XEXDATA. Problems may
+result in the event that someone else uses the same name to implement some other extension.
+If this option is specified, <application>Courier's</application> ESMTP server will also
+advertise a dummy ESMTP capability called XCOURIEREXTENSIONS, and will not recognize any
+Courier-specific extensions unless the remote mail server also advertises this dummy ESMTP
+capability.</para>
+
+<para><option>--disable-autorenamesent</option>: do not rename the Sent folder every month.
+This option can also be controlled by the SQWEBMAIL_AUTORENAMESENT environment variable.</para>
 
 <para><option>--disable-root-check</option>: Allows
Index: server/mail/courier/courier-inst.xml
===================================================================
--- server/mail/courier/courier-inst.xml	(revision a945d40ec2728e3e6032e61583c0ec375f02a2c2)
+++ server/mail/courier/courier-inst.xml	(revision 2f473b244e709160ad1ddce322847cee6d5da326)
@@ -13,9 +13,10 @@
 
 <screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc/courier --with-piddir=/var/run \
---libexecdir=/usr/sbin --datadir=/usr/share/courier \
---localstatedir=/var/spool/courier --disable-root-check --with-db=gdbm \
+--libexecdir=/usr/lib/courier  --datadir=/usr/share/courier \
+--localstatedir=/var/lib/courier --disable-root-check --with-db=gdbm \
+--with-paranoid-smtpext --disable-autorenamesent \
 --with-mailuser=courier --with-mailgroup=courier \
 --enable-workarounds-for-imap-client-bugs \
---with-ispell=/usr/bin/aspell &amp;&amp;
+--with-ispell=/usr/bin/aspell --enable-mimetypes=/etc/apache/mime.types &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
@@ -23,5 +24,5 @@
 
 <!-- # Note - You may receive an error saying that the mime.types file
-could not be found.  This can easily be corrected by adding
+could not be found.  This can easily be corrected by changing
 -enable-mimetypes=(location of mime.types file)  -->
 
Index: server/mail/courier/courier.ent
===================================================================
--- server/mail/courier/courier.ent	(revision a945d40ec2728e3e6032e61583c0ec375f02a2c2)
+++ server/mail/courier/courier.ent	(revision 2f473b244e709160ad1ddce322847cee6d5da326)
@@ -5,8 +5,8 @@
 <!ENTITY courier-config SYSTEM "courier-config.xml">
 <!ENTITY courier-desc SYSTEM "courier-desc.xml">
-<!ENTITY courier-version "0.43.2">
+<!ENTITY courier-version "0.45.0">
 <!ENTITY courier-download-http "http://osdn.dl.sourceforge.net/sourceforge/courier/courier-&courier-version;.tar.bz2">
 <!ENTITY courier-download-ftp "ftp://ftp.pu.edu.tw/Unix/Mail/maildrop/courier-&courier-version;.tar.bz2">
-<!ENTITY courier-size "3.3 MB">
-<!ENTITY courier-buildsize "104 MB">
+<!ENTITY courier-size "4.2 MB">
+<!ENTITY courier-buildsize "134 MB">
 <!ENTITY courier-time "2.79 SBU">
