diff --git a/ChangeLog b/ChangeLog
index bf31b70c8..5701cf5c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
+= mbed TLS 1.3.16 released 2015-12-xx
+
+Bugfix
+   * Fix over-restricive length limit in GCM. Found by Andreas-N. #362
+
 = mbed TLS 1.3.15 released 2015-11-04
 
 Security
diff --git a/library/gcm.c b/library/gcm.c
index b537b0205..83f2fd2bd 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -357,7 +357,7 @@ int gcm_update( gcm_context *ctx,
     /* Total length is restricted to 2^39 - 256 bits, ie 2^36 - 2^5 bytes
      * Also check for possible overflow */
     if( ctx->len + length < ctx->len ||
-        (uint64_t) ctx->len + length > 0x03FFFFE0ull )
+        (uint64_t) ctx->len + length > 0xFFFFFFFE0ull )
     {
         return( POLARSSL_ERR_GCM_BAD_INPUT );
     }