Index: head/sys/kern/subr_compressor.c
===================================================================
--- head/sys/kern/subr_compressor.c
+++ head/sys/kern/subr_compressor.c
@@ -66,8 +66,7 @@
 
 #ifdef GZIO
 
-#include <sys/gsb_crc32.h>
-#include <sys/zutil.h>
+#include <contrib/zlib/zutil.h>
 
 struct gz_stream {
 	uint8_t		*gz_buffer;	/* output buffer */
@@ -141,7 +140,7 @@
 
 	s = stream;
 	s->gz_off = 0;
-	s->gz_crc = ~0U;
+	s->gz_crc = crc32(0L, Z_NULL, 0);
 
 	(void)deflateReset(&s->gz_stream);
 	s->gz_stream.avail_out = s->gz_bufsz;
@@ -173,9 +172,8 @@
 	if (len > 0) {
 		s->gz_stream.avail_in = len;
 		s->gz_stream.next_in = data;
-		s->gz_crc = crc32_raw(data, len, s->gz_crc);
-	} else
-		s->gz_crc ^= ~0U;
+		s->gz_crc = crc32(s->gz_crc, data, len);
+	}
 
 	error = 0;
 	do {