diff --git a/ChangeLog b/ChangeLog
index 300c11d9fefd7f775611e862f069305d50100695..b67b44d10c927f133deff8d7c33963fb2bbc5273 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-20  Niels Möller  <nisse@lysator.liu.se>
+
+	* tools/nettle-hash.c (list_algorithms): Also display the internal
+	context size.
+
 2017-01-03  Nikos Mavrogiannopoulos <nmav@redhat.com>
 
 	* ecdsa-verify.c (ecdsa_verify): Eliminated memory leak on error
diff --git a/tools/nettle-hash.c b/tools/nettle-hash.c
index fc991ee97ee76d41abd2b6dbd0ef9f679e960f86..488dff3d08d3bd333cbc51a00707399983c1fc8a 100644
--- a/tools/nettle-hash.c
+++ b/tools/nettle-hash.c
@@ -53,11 +53,11 @@ list_algorithms (void)
 {
   unsigned i;
   const struct nettle_hash *alg;
-  printf ("%10s digestsize (internal block size), in units of octets\n", "name");
+  printf ("%10s digestsize (internal block size, context size), in units of octets\n", "name");
 
   for (i = 0; (alg = nettle_hashes[i]); i++)
-    printf ("%10s %d (%d)\n",
-	    alg->name, alg->digest_size, alg->block_size);
+    printf ("%10s %d (%d, %d)\n",
+	    alg->name, alg->digest_size, alg->block_size, alg->context_size);
 };
 
 static const struct nettle_hash *