diff --git a/Changes b/Changes
index 11813761f..dfaba176f 100644
--- a/Changes
+++ b/Changes
@@ -1989,3 +1989,4 @@ seen. gmtime warning still there
   flooder is banned for and how much data (in KB) the user must send before being banned.
   This should fix (#0000767) reported by ora.
 - Updated some documentation
+- (Hopefully) fixed some Ziplinks problems
diff --git a/src/zip.c b/src/zip.c
index c4634266d..ebe03c38a 100644
--- a/src/zip.c
+++ b/src/zip.c
@@ -117,21 +117,20 @@ int     zip_init(aClient *cptr, int compressionlevel)
 */
 void    zip_free(aClient *cptr)
 {
-  if (cptr->zip)
-    {
-      if (cptr->zip->in) {
-        inflateEnd(cptr->zip->in);
-        MyFree(cptr->zip->in);
-        cptr->zip->in = NULL;
-      }
-      if (cptr->zip->out) {
-        deflateEnd(cptr->zip->out);
-        MyFree(cptr->zip->out);
-        cptr->zip->out = NULL;
-      }
-      MyFree(cptr->zip);
-      cptr->zip = NULL;
-    }
+	ClearZipped(cptr);
+	if (cptr->zip)
+	{
+		if (cptr->zip->in)
+			inflateEnd(cptr->zip->in);
+		MyFree(cptr->zip->in);
+		cptr->zip->in = NULL;
+		if (cptr->zip->out) 
+			deflateEnd(cptr->zip->out);
+		MyFree(cptr->zip->out);
+		cptr->zip->out = NULL;
+		MyFree(cptr->zip);
+		cptr->zip = NULL;
+	}
 }
 
 /*