diff --git a/ChangeLog b/ChangeLog
index 30b98468c..deddb4c0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Bugfix
      with non-blocking I/O.
    * x509_crt_parse() did not increase total_failed on PEM error
    * Fix compiler warnings on iOS (found by Sander Niemeijer).
+   * Don't print uninitialised buffer in ssl_mail_client (found by Marc Abel).
 
 Changes
    * X.509 certificates with more than one AttributeTypeAndValue per
diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c
index 31e22fc88..90845bd4d 100644
--- a/programs/ssl/ssl_mail_client.c
+++ b/programs/ssl/ssl_mail_client.c
@@ -375,6 +375,8 @@ int main( int argc, char *argv[] )
     memset( &rsa, 0, sizeof( rsa_context ) );
     memset( &ssl, 0, sizeof( ssl_context ) );
 
+    memset( buf, 0, sizeof( buf ) );
+
     if( argc == 0 )
     {
     usage: