diff --git a/library/sha512.c b/library/sha512.c
index 37fc96d..08f4dd5 100644
--- a/library/sha512.c
+++ b/library/sha512.c
@@ -311,6 +311,12 @@
     for( i = 0; i < 8; i++ )
         ctx->state[i] += A[i];
 
+    /* Zeroise buffers and variables to clear sensitive data from memory. */
+    mbedtls_platform_zeroize( &A, sizeof( A ) );
+    mbedtls_platform_zeroize( &W, sizeof( W ) );
+    mbedtls_platform_zeroize( &temp1, sizeof( temp1 ) );
+    mbedtls_platform_zeroize( &temp2, sizeof( temp2 ) );
+
     return( 0 );
 }