diff --git a/common/ChangeLog b/common/ChangeLog
index eb1f22e2c..702596661 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,6 +1,10 @@
+2011-01-20  Werner Koch  <wk@g10code.com>
+
+	* estream.c (es_func_mem_write): Fix computation of NEWSIZE.
+
 2011-01-11  Werner Koch  <wk@g10code.com>
 
-        Estream changes as used gnupg master from 2010-07-19.
+        Estream changes as used by gnupg master from 2010-07-19.
 
 	* estream.c (es_fname_get, es_fname_set): New.
 	(fname_set_internal): New.
diff --git a/common/estream.c b/common/estream.c
index 3ab68b5ff..9f7dfd0a9 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -497,7 +497,7 @@ typedef struct estream_cookie_mem
 
 
 /* Create function for memory objects.  DATA is either NULL or a user
-   supplied buffer with the initial conetnt of the memory buffer.  If
+   supplied buffer with the initial content of the memory buffer.  If
    DATA is NULL, DATA_N and DATA_LEN need to be 0 as well.  If DATA is
    not NULL, DATA_N gives the allocated size of DATA and DATA_LEN the
    used length in DATA.  */
@@ -596,7 +596,7 @@ es_func_mem_write (void *cookie, const void *buffer, size_t size)
       if (!mem_cookie->memory_size)
         newsize = size;  /* Not yet allocated.  */
       else
-        newsize = mem_cookie->memory_size + (nleft - size);
+        newsize = mem_cookie->memory_size + (size - nleft);
       if (newsize < mem_cookie->offset)
         {
           _set_errno (EINVAL);