diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 51aebcf4123d..939470d4b8ef 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -32,7 +32,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	marcus@corp.grupos.com.br
 COMMENT=	A secure alternative to widely-used Sendmail
 
-PORTVERSIONRAW=	2.3-20050401
+PORTVERSIONRAW=	2.3-20050404
 
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index f31ae4bdb856..49be59e676a0 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,2 +1,2 @@
-MD5 (postfix/postfix-2.3-20050401.tar.gz) = b0760635e7e767e67c0ee39056819388
-SIZE (postfix/postfix-2.3-20050401.tar.gz) = 2442891
+MD5 (postfix/postfix-2.3-20050404.tar.gz) = ed014027f63626bffe5dd7dd3a4e187b
+SIZE (postfix/postfix-2.3-20050404.tar.gz) = 2442512
diff --git a/mail/postfix-current/files/patch-src-lmtp-lmtp_sasl_glue.c b/mail/postfix-current/files/patch-src-lmtp-lmtp_sasl_glue.c
new file mode 100644
index 000000000000..b1395120ad44
--- /dev/null
+++ b/mail/postfix-current/files/patch-src-lmtp-lmtp_sasl_glue.c
@@ -0,0 +1,32 @@
+--- src/lmtp/lmtp_sasl_glue.c.orig	Mon Apr 11 00:08:53 2005
++++ src/lmtp/lmtp_sasl_glue.c	Mon Apr 11 00:09:03 2005
+@@ -292,6 +292,14 @@
+ 
+ void    lmtp_sasl_initialize(void)
+ {
++    /*
++     * Global callbacks. These have no per-session context.
++     */
++    static sasl_callback_t callbacks[] = {
++	{SASL_CB_LOG, &lmtp_sasl_log, 0},
++	{SASL_CB_LIST_END, 0, 0}
++    };
++
+ #if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MINOR >= 2 \
+     || (SASL_VERSION_MINOR == 1 && SASL_VERSION_STEP >= 19))
+     int     sasl_major;
+@@ -313,14 +321,6 @@
+ 		  SASL_VERSION_MAJOR, SASL_VERSION_MINOR, SASL_VERSION_STEP,
+ 		  sasl_major, sasl_minor, sasl_step);
+ #endif
+-
+-    /*
+-     * Global callbacks. These have no per-session context.
+-     */
+-    static sasl_callback_t callbacks[] = {
+-	{SASL_CB_LOG, &lmtp_sasl_log, 0},
+-	{SASL_CB_LIST_END, 0, 0}
+-    };
+ 
+     /*
+      * Sanity check.
diff --git a/mail/postfix-current/files/patch-src-smtp-smtp_sasl_glue.c b/mail/postfix-current/files/patch-src-smtp-smtp_sasl_glue.c
new file mode 100644
index 000000000000..6e496e2b7551
--- /dev/null
+++ b/mail/postfix-current/files/patch-src-smtp-smtp_sasl_glue.c
@@ -0,0 +1,32 @@
+--- src/smtp/smtp_sasl_glue.c.orig	Mon Apr 11 00:09:17 2005
++++ src/smtp/smtp_sasl_glue.c	Mon Apr 11 00:09:30 2005
+@@ -321,6 +321,14 @@
+ 
+ void    smtp_sasl_initialize(void)
+ {
++    /*
++     * Global callbacks. These have no per-session context.
++     */
++    static sasl_callback_t callbacks[] = {
++	{SASL_CB_LOG, &smtp_sasl_log, 0},
++	{SASL_CB_LIST_END, 0, 0}
++    };
++
+ #if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MINOR >= 2 \
+     || (SASL_VERSION_MINOR == 1 && SASL_VERSION_STEP >= 19))
+     int     sasl_major;
+@@ -342,14 +350,6 @@
+ 		  SASL_VERSION_MAJOR, SASL_VERSION_MINOR, SASL_VERSION_STEP,
+ 		  sasl_major, sasl_minor, sasl_step);
+ #endif
+-
+-    /*
+-     * Global callbacks. These have no per-session context.
+-     */
+-    static sasl_callback_t callbacks[] = {
+-	{SASL_CB_LOG, &smtp_sasl_log, 0},
+-	{SASL_CB_LIST_END, 0, 0}
+-    };
+ 
+     /*
+      * Sanity check.