diff --git a/ChangeLog b/ChangeLog
index 815594b49ba065e90cbb97f1e485195bdc488e25..a97556e87e204522e37f14887d0c832de111a241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* nettle.texinfo (GCM): Document GCM_DIGEST_SIZE.
 	(UMAC): Document new UMAC constants.
+	(Keyed hash functions): Make HMAC and UMAC their own info nodes.
 
 	* umac.h (UMAC_MIN_NONCE_SIZE, UMAC_MAX_NONCE_SIZE): New
 	constants.
diff --git a/nettle.texinfo b/nettle.texinfo
index 89fcad96c93f48d5037846ef10ca9846ca29248b..3601cd5941fea6e811266c5680f77012af3fbbba 100644
--- a/nettle.texinfo
+++ b/nettle.texinfo
@@ -83,12 +83,23 @@ Reference
 * Miscellaneous functions::     
 * Compatibility functions::     
 
+Hash functions
+
+* Recommended hash functions::
+* Legacy hash functions::
+* nettle_hash abstraction::
+
 Cipher modes
 
 * CBC::                         
 * CTR::                         
 * GCM::                         
-* CCM::
+* CCM::                         
+
+Keyed Hash Functions
+
+* HMAC::
+* UMAC::
 
 Public-key algorithms
 
@@ -2463,6 +2474,14 @@ Bob.
 Keyed hash functions are typically a lot faster than digital signatures
 as well.
 
+@menu
+* HMAC::
+* UMAC::
+@end menu
+
+@node HMAC, UMAC, Keyed hash functions, Keyed hash functions
+@comment  node-name,  next,  previous,  up
+
 @subsection @acronym{HMAC}
 @cindex HMAC
 
@@ -2678,6 +2697,9 @@ This function also resets the context for processing new messages, with
 the same key.
 @end deftypefun
 
+@node UMAC,  , HMAC, Keyed hash functions
+@comment  node-name,  next,  previous,  up
+
 @subsection @acronym{UMAC}
 @cindex UMAC