diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index 92152cdf7d68c00719c3fbef4c914cbb21e430f7..47cc78166954765775d3d98e79ad7ab386767067 100644
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -82,6 +82,8 @@ Curl_unencode_deflate_write(struct SessionHandle *data,
     z->zalloc = (alloc_func)Z_NULL;
     z->zfree = (free_func)Z_NULL;
     z->opaque = 0;              /* of dubious use 08/27/02 jhrg */
+    z->next_in = NULL;
+    z->avail_in = 0;
     if (inflateInit(z) != Z_OK)
       return process_zlib_error(data, z);
     k->zlib_init = 1;
@@ -224,6 +226,8 @@ Curl_unencode_gzip_write(struct SessionHandle *data,
     z->zalloc = (alloc_func)Z_NULL;
     z->zfree = (free_func)Z_NULL;
     z->opaque = 0;              /* of dubious use 08/27/02 jhrg */
+    z->next_in = NULL;
+    z->avail_in = 0;
     if (inflateInit2(z, -MAX_WBITS) != Z_OK)
       return process_zlib_error(data, z);
     k->zlib_init = 1;   /* Initial call state */
diff --git a/src/mkhelp.pl b/src/mkhelp.pl
index 2e1e6985a9b7a394153d5f6a404a7efa08893922..1c0a867dab47523635ce730499b59a15aeef9670 100644
--- a/src/mkhelp.pl
+++ b/src/mkhelp.pl
@@ -158,6 +158,8 @@ void hugehelp(void)
   z.zalloc = (alloc_func)Z_NULL;
   z.zfree = (free_func)Z_NULL;
   z.opaque = 0;
+  z.next_in = NULL;
+  z.avail_in = 0;
 
   if (inflateInit2(&z, -MAX_WBITS) != Z_OK)
     return;