diff --git a/ChangeLog b/ChangeLog
index 4e8cc1b672..f6016fb6e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-02-03  Jean-Louis Martineau <martineau@zmanda.com>
+	* device-src/s3-util.c: Fix memory allocation issue.
+
 2015-02-03  Jean-Louis Martineau <martineau@zmanda.com>
 	* application-src/amstar.c: Support include in backup mode.
 
diff --git a/device-src/s3-util.c b/device-src/s3-util.c
index 19c0bf2808..feee384856 100644
--- a/device-src/s3-util.c
+++ b/device-src/s3-util.c
@@ -235,6 +235,7 @@ EncodeHMACSHA256(
 {
     unsigned char *hmachash = malloc(32);
     const unsigned char *datatohash = (unsigned char *)data;
+    unsigned char tk[SHA256_DIGEST_LENGTH];
 
     // Initialise HMACh
     HMAC_CTX HMAC;
@@ -242,7 +243,6 @@ EncodeHMACSHA256(
     memset(hmachash, 0, hmaclength);
 
     if (keylen > 64 ) {
-	unsigned char tk[SHA256_DIGEST_LENGTH];
 	SHA256(key, keylen, tk);
 	key    = tk;
 	keylen = SHA256_DIGEST_LENGTH;