diff --git a/postfix-2.8.5-ssl-release-buffers.patch b/postfix-2.8.5-ssl-release-buffers.patch
new file mode 100644
index 0000000..e47e1b6
--- /dev/null
+++ b/postfix-2.8.5-ssl-release-buffers.patch
@@ -0,0 +1,29 @@
+--- src/tls/tls_client.c.orig
++++ src/tls/tls_client.c
+@@ -372,6 +372,12 @@ TLS_APPL_STATE *tls_client_init(const TL
+ 	return (0);
+     }
+ 
++    /* Keep memory usage as low as possible */
++
++#ifdef SSL_MODE_RELEASE_BUFFERS
++    SSL_CTX_set_mode(client_ctx, SSL_MODE_RELEASE_BUFFERS);
++#endif
++
+     /*
+      * See the verify callback in tls_verify.c
+      */
+--- src/tls/tls_server.c.orig
++++ src/tls/tls_server.c
+@@ -381,6 +381,11 @@ TLS_APPL_STATE *tls_server_init(const TL
+ 	tls_print_errors();
+ 	return (0);
+     }
++    
++     /* Keep memory usage as low as possible */
++#ifdef SSL_MODE_RELEASE_BUFFERS
++    SSL_CTX_set_mode(server_ctx, SSL_MODE_RELEASE_BUFFERS);
++#endif
+ 
+     /*
+      * See the verify callback in tls_verify.c
diff --git a/postfix.changes b/postfix.changes
index f6a0e8e..7488339 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Oct  9 04:30:54 UTC 2011 - crrodriguez@opensuse.org
+
+ - Use SSL_MODE_RELEASE_BUFFERS if available, see 
+  SSL_CTX_set_mode man page and 
+  http://www.imperialviolet.org/2010/06/25/overclocking-ssl.html
+  for the full details.
+
 -------------------------------------------------------------------
 Tue Sep  6 14:49:47 UTC 2011 - chris@computersalat.de
 
diff --git a/postfix.spec b/postfix.spec
index 7745441..c038d5f 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -15,6 +15,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+
 Name:           postfix
 Summary:        A fast, secure, and flexible mailer
 Version:        2.8.5
@@ -36,6 +38,7 @@ Patch10:        %{name}-2.8.3-main.cf.patch
 Patch11:        %{name}-2.8.3-master.cf.patch
 Patch12:        %{name}-2.8.3-post-install.patch
 Patch20:        %{name}-vda-v10-2.8.3.patch
+Patch21:        postfix-2.8.5-ssl-release-buffers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %insserv_prereq %fillup_prereq
 PreReq:         /usr/bin/getent
@@ -145,6 +148,7 @@ PostgreSQL.
 %patch11 -p1
 %patch12 -p1
 %patch20 -p1
+%patch21
 # ---------------------------------------------------------------------------
 
 %build