diff --git a/conf.d/zlib.conf.sample b/conf.d/zlibcompress.conf.sample
similarity index 100%
rename from conf.d/zlib.conf.sample
rename to conf.d/zlibcompress.conf.sample
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 1b60c828..61c6c5b4 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -133,7 +133,7 @@ PROGS := $(PROGS) openssl.yate
 endif
 
 ifneq (@HAVE_ZLIB@,no)
-PROGS := $(PROGS) zlib.yate
+PROGS := $(PROGS) zlibcompress.yate
 endif
 
 ifeq (@HAVE_COREDUMPER@,yes)
@@ -325,8 +325,8 @@ server/sipfeatures.yate: ../libs/yxml/libyatexml.a
 server/sipfeatures.yate: LOCALFLAGS = -I@top_srcdir@/libs/yxml
 server/sipfeatures.yate: LOCALLIBS = -L../libs/yxml -lyatexml
 
-zlib.yate: LOCALFLAGS = @ZLIB_INC@
-zlib.yate: LOCALLIBS = @ZLIB_LIB@
+zlibcompress.yate: LOCALFLAGS = @ZLIB_INC@
+zlibcompress.yate: LOCALLIBS = @ZLIB_LIB@
 
 ../libyatesig.so ../libs/ysig/libyatesig.a:
 	$(MAKE) -C ../libs/ysig
diff --git a/modules/zlib.cpp b/modules/zlibcompress.cpp
similarity index 98%
rename from modules/zlib.cpp
rename to modules/zlibcompress.cpp
index 760e45dc..75c4dd19 100644
--- a/modules/zlib.cpp
+++ b/modules/zlibcompress.cpp
@@ -1,5 +1,5 @@
 /**
- * zlib.cpp
+ * zlibcompress.cpp
  * This file is part of the YATE Project http://YATE.null.ro
  *
  * ZLib support
@@ -24,9 +24,7 @@
 
 #include <yatephone.h>
 #include <string.h>
-#ifdef _WINDOWS
-#define ZLIB_WINAPI
-#endif
+
 #include <zlib.h>
 
 using namespace TelEngine;
@@ -386,7 +384,7 @@ bool ZLibComp::init(bool comp, bool decomp, const NamedList& params)
  * ZLibModule
  */
 ZLibModule::ZLibModule()
-    : Module("zlib","misc",true)
+    : Module("zlibcompress","misc",true)
 {
     Output("Loaded module ZLib - using zlib library version %s",zlibVersion());
 }
@@ -401,7 +399,7 @@ void ZLibModule::initialize()
     static bool first = true;
 
     Output("Initializing module ZLib");
-    Configuration cfg(Engine::configFile("zlib"));
+    Configuration cfg(Engine::configFile("zlibcompress"));
     NamedList dummy("");
     NamedList* gen = cfg.getSection("general");
     if (!gen)
diff --git a/windows/YATE.sln b/windows/YATE.sln
index 8b1d0b5a..1276a8fc 100644
--- a/windows/YATE.sln
+++ b/windows/YATE.sln
@@ -482,7 +482,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sigtransport", "_sigtransp
 		{254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_zlib", "_zlib.vcproj", "{AB81DDE2-2AE9-C12C-9FAC-753E10B5C790}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_zlibcompress", "_zlibcompress.vcproj", "{AB81DDE2-2AE9-C12C-9FAC-753E10B5C790}"
 	ProjectSection(ProjectDependencies) = postProject
 		{254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381}
 	EndProjectSection
diff --git a/windows/_zlib.vcproj b/windows/_zlibcompress.vcproj
similarity index 85%
rename from windows/_zlib.vcproj
rename to windows/_zlibcompress.vcproj
index 2b1d01ba..31b48518 100644
--- a/windows/_zlib.vcproj
+++ b/windows/_zlibcompress.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="_zlib"
+	Name="_zlibcompress"
 	ProjectGUID="{AB81DDE2-2AE9-C12C-9FAC-753E10B5C790}"
-	RootNamespace="_zlib"
+	RootNamespace="_zlibcompress"
 	>
 	<Platforms>
 		<Platform
@@ -42,7 +42,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Release/_zlib.tlb"
+				TypeLibraryName=".\Release/_zlibcompress.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -50,11 +50,11 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories=".,.."
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL,ZLIB_WINAPI"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release\modules/_zlib.pch"
+				PrecompiledHeaderFile=".\Release\modules/_zlibcompress.pch"
 				AssemblerListingLocation=".\Release\modules/"
 				ObjectFile=".\Release\modules/"
 				ProgramDataBaseFileName=".\Release\modules/"
@@ -76,11 +76,11 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="zlibstat.lib"
-				OutputFile="Release/zlib.yate"
+				OutputFile="Release/zlibcompress.yate"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\Release/zlib.pdb"
-				ImportLibrary=".\Release/zlib.lib"
+				ProgramDatabaseFile=".\Release/zlibcompress.pdb"
+				ImportLibrary=".\Release/zlibcompress.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -95,7 +95,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Release/_zlib.bsc"
+				OutputFile=".\Release/_zlibcompress.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -138,18 +138,18 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/_zlib.tlb"
+				TypeLibraryName=".\Debug/_zlibcompress.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".,.."
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL,ZLIB_WINAPI"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug\modules/_zlib.pch"
+				PrecompiledHeaderFile=".\Debug\modules/_zlibcompress.pch"
 				AssemblerListingLocation=".\Debug\modules/"
 				ObjectFile=".\Debug\modules/"
 				ProgramDataBaseFileName=".\Debug\modules/"
@@ -172,12 +172,12 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="zlibstat.lib"
-				OutputFile="Debug/zlib.yate"
+				OutputFile="Debug/zlibcompress.yate"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/zlib.pdb"
-				ImportLibrary=".\Debug/zlib.lib"
+				ProgramDatabaseFile=".\Debug/zlibcompress.pdb"
+				ImportLibrary=".\Debug/zlibcompress.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -192,7 +192,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Debug/_zlib.bsc"
+				OutputFile=".\Debug/_zlibcompress.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -216,7 +216,7 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="..\modules\zlib.cpp"
+				RelativePath="..\modules\zlibcompress.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/windows/yate.iss b/windows/yate.iss
index a1de1ca6..a2a1fc56 100644
--- a/windows/yate.iss
+++ b/windows/yate.iss
@@ -53,6 +53,8 @@ Name: "codecs\gsm"; Description: "GSM codec"; Types: full client server
 Name: "codecs\ilbc"; Description: "iLBC codec"; Types: full client server
 Name: "codecs\speex"; Description: "SPEEX codec"; Types: full client server
 Name: "codecs\speex\run"; Description: "SPEEX runtime libraries"; Types: full client server
+Name: "compress"; Description: "Data compression support"; Types: full client server
+Name: "compress\zlib"; Description: "Zlib compression"; Types: full client server
 Name: "external"; Description: "External interfaces"; Types: full server
 Name: "external\php"; Description: "PHP5 scripting"; Types: full server
 Name: "debug"; Description: "Extra debugging support"; Types: full engine
@@ -132,6 +134,8 @@ Source: "Release\gsmcodec.yate"; DestDir: "{app}\modules"; Flags: replacesamever
 Source: "Release\ilbccodec.yate"; DestDir: "{app}\modules"; Flags: replacesameversion; Components: codecs\ilbc
 Source: "Release\speexcodec.yate"; DestDir: "{app}\modules"; Flags: replacesameversion; Components: codecs\speex
 
+Source: "Release\zlibcompress.yate"; DestDir: "{app}\modules"; Flags: replacesameversion; Components: compress\zlib
+
 Source: "Release\server\mysqldb.yate"; DestDir: "{app}\modules\server"; Flags: replacesameversion; Components: database\my
 Source: "Release\server\pgsqldb.yate"; DestDir: "{app}\modules\server"; Flags: replacesameversion; Components: database\pg