diff --git a/postfix/HISTORY b/postfix/HISTORY
index 5c62a02fa..6833bcadc 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -16591,3 +16591,13 @@ Apologies for any names omitted.
 	and smtp_per_record_deadline (default: "no").  Files:
 	global/mail_params.h, smtpd/smtpd.c, smtp/smtp.c,
 	smtp/smtp_proto.c, proto/postconf.proto, mantools/postlink.
+
+20110213
+
+	Workaround (problem introduced with Postfix TLS patch): the
+	TLS library passes the same information via different
+	function arguments, and this same information is maintained
+	by different functions, so things get out of step when code
+	is updated. As of 20110212, tls_client_start() needs to set
+	the VSTREAM property of the TLS session object. File:
+	tls/tls_client.c.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 6fdbc0590..4e568e835 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20110212"
+#define MAIL_RELEASE_DATE	"20110213"
 #define MAIL_VERSION_NUMBER	"2.9"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/tls/tls_client.c b/postfix/src/tls/tls_client.c
index 79a7d44b5..795ba7d70 100644
--- a/postfix/src/tls/tls_client.c
+++ b/postfix/src/tls/tls_client.c
@@ -795,6 +795,7 @@ TLS_SESS_STATE *tls_client_start(const TLS_CLIENT_START_PROPS *props)
     TLScontext->cache_type = app_ctx->cache_type;
 
     TLScontext->serverid = vstring_export(myserverid);
+    TLScontext->stream = props->stream;
 
     if ((TLScontext->con = SSL_new(app_ctx->ssl_ctx)) == NULL) {
 	msg_warn("Could not allocate 'TLScontext->con' with SSL_new()");