diff --git a/postfix/HISTORY b/postfix/HISTORY
index a73451d68..4a33442ff 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -6585,6 +6585,13 @@ Apologies for any names omitted.
 	after the MIME output conversion. Problem found by Mark
 	Martinec.  File: smtp/smtp_proto.c.
 
+20020601
+
+	Bugfix: the deliver_pass() routine needed updating for the
+	extra MIME encoding attribute that was introduced 20020510.
+	Patch by Sebastian Schaffert @ wastl.net.  File:
+	global/deliver_pass.c.
+
 Open problems:
 
 	Medium: old maildrop files are no longer readable by the
diff --git a/postfix/src/global/deliver_pass.c b/postfix/src/global/deliver_pass.c
index f428d551e..d2492292f 100644
--- a/postfix/src/global/deliver_pass.c
+++ b/postfix/src/global/deliver_pass.c
@@ -100,6 +100,7 @@ static int deliver_pass_send_request(VSTREAM *stream, DELIVER_REQUEST *request,
 	       ATTR_TYPE_LONG, MAIL_ATTR_OFFSET, request->data_offset,
 	       ATTR_TYPE_LONG, MAIL_ATTR_SIZE, request->data_size,
 	       ATTR_TYPE_STR, MAIL_ATTR_NEXTHOP, nexthop,
+	       ATTR_TYPE_STR, MAIL_ATTR_ENCODING, request->encoding,
 	       ATTR_TYPE_STR, MAIL_ATTR_SENDER, request->sender,
 	       ATTR_TYPE_STR, MAIL_ATTR_ERRTO, request->errors_to,
 	       ATTR_TYPE_STR, MAIL_ATTR_RRCPT, request->return_receipt,
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index abc06f077..6334f389f 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only, unless they include the same bugfix as a patch release.
   */
-#define MAIL_RELEASE_DATE	"20020601"
+#define MAIL_RELEASE_DATE	"20020602"
 
 #define VAR_MAIL_VERSION	"mail_version"
 #define DEF_MAIL_VERSION	"1.1.11-" MAIL_RELEASE_DATE