diff --git a/ChangeLog b/ChangeLog
index f1ae79c711cc7529923fba5203fa78a52d5d7be8..9478e0c14ef9bdfcb519a39e85f90c1a89dc83de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-04-24  Niels Möller  <nisse@lysator.liu.se>
 
+	* nettle.texinfo (Miscellaneous functions): Updated memxor
+	prototype. Document memxor3.
+
 	* salsa20-crypt.c (salsa20_crypt): Deleted cast of memxor
 	argument, no longer needed.
 	* salsa20r12-crypt.c (salsa20r12_crypt): Likewise.
diff --git a/nettle.texinfo b/nettle.texinfo
index 44ee3124d69bd7f77f1895fc30140182fca3d93c..688ceca594380dee5b6c88695179f0a10262d29a 100644
--- a/nettle.texinfo
+++ b/nettle.texinfo
@@ -3717,12 +3717,18 @@ error.
 @comment  node-name,  next,  previous,  up
 @section Miscellaneous functions
 
-@deftypefun {uint8_t *} memxor (uint8_t *@var{dst}, const uint8_t *@var{src}, size_t @var{n})
+@deftypefun {void *} memxor (void *@var{dst}, const void *@var{src}, size_t @var{n})
 XORs the source area on top of the destination area. The interface
 doesn't follow the Nettle conventions, because it is intended to be
 similar to the ANSI-C @code{memcpy} function.
 @end deftypefun
 
+@deftypefun {void *} memxor3 (void *@var{dst}, const void *@var{a}, const void *@var{b}, size_t @var{n})
+Like @code{memxor}, but takes two source areas and separate
+destination area.
+@end deftypefun
+
+
 @code{memxor} is declared in @file{<nettle/memxor.h>}.
 
 @node Compatibility functions,  , Miscellaneous functions, Reference