diff --git a/mozilla/network/module/nsNetThread.cpp b/mozilla/network/module/nsNetThread.cpp
index c5cb51d8e63..7cbc4d5132c 100644
--- a/mozilla/network/module/nsNetThread.cpp
+++ b/mozilla/network/module/nsNetThread.cpp
@@ -36,6 +36,7 @@ extern "C" {
 #include "mktrace.h"
 #include "mkstream.h"
 #include "cvchunk.h"
+#include "cvunzip.h"
 
 #include "fileurl.h"
 #include "httpurl.h"
@@ -104,6 +105,15 @@ nsresult NS_InitNetlib(void)
     NET_RegisterContentTypeConverter(APPLICATION_HTTP_INDEX, FO_NGLAYOUT,
                                     NULL, NET_HTTPIndexFormatToHTMLConverter);
 
+    NET_RegisterEncodingConverter(ENCODING_GZIP,
+                                  (void *) ENCODING_GZIP,
+                                  NET_UnZipConverter);
+    NET_RegisterEncodingConverter(ENCODING_GZIP2,
+                                  (void *) ENCODING_GZIP2,
+                                  NET_UnZipConverter);
+
+    NET_RegisterAllEncodingConverters("*", FO_NGLAYOUT);
+
     NET_RegisterUniversalEncodingConverter("chunked",
                                            NULL,
                                            NET_ChunkedDecoderStream);