diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1ead860627..f504e78140 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-06-04 12:17 UTC+0200 Enrico Maria Giordano (e.m.giordano@emagsoftware.it)
+  * harbour/contrib/hbzlib/include/zipexception.h
+    * removed wrong CZipException:: qualificator in CZipException copy constructor
+
+  * harbour/contrib/hbzlib/zip.c
+    + added extern void hb_fsDirectory() declaration
+
+  * harbour/contrib/hbzlib/include/hbzip2.h
+  * harbour/contrib/hbzlib/zipnew.cpp
+    * changed fifth parameter to const char *pbyBuffer in hb_UnzipSel() function
+
 2007-06-03 23:03 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/include/hbexprop.h
   * harbour/include/hbexprb.c
@@ -19,7 +30,7 @@
 
 2007-06-02 12:30 UTC+0200 Enrico Maria Giordano (e.m.giordano@emagsoftware.it)
   * harbour/contrib/hbzlib
-     * replaced with the one borrowed from xharbour, source modifications by Przemek
+    * replaced with the one borrowed from xharbour, source modifications by Przemek
 
   * harbour/contrib/hbzlib/makefile
   * harbour/contrib/hbzlib/makefile.bc
@@ -38,9 +49,6 @@
   + harbour/contrib/hbzlib/doc/zipnew.txt
     + added documentation borrowed from xharbour/doc/en
 
-  - harbour/contrib/hbzlib/BccW32.cfg
-    - removed unuseful file
-
 2007-06-01 21:25 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/pgsql/postgres.c
     * cover PQescapeByteaConn() by #if HB_PGVERSION >= 0x0800
diff --git a/harbour/contrib/hbzlib/include/hbzip2.h b/harbour/contrib/hbzlib/include/hbzip2.h
index a1a5a88082..e4de984f4a 100644
--- a/harbour/contrib/hbzlib/include/hbzip2.h
+++ b/harbour/contrib/hbzlib/include/hbzip2.h
@@ -119,7 +119,7 @@ extern int      hb___SetCallbackFunc(PHB_ITEM pFunc);
 extern int      hb_CmpTdSpan(char *szFile,PHB_ITEM pArray,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite,char *szPassWord,int iSpanSize ,BOOL bPath ,BOOL bDrive,PHB_ITEM pProgress);
 
 extern int      hb_CompressFile(char *szFile,PHB_ITEM pArray,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite,char *szPassWord,BOOL bPath,BOOL bDrive,PHB_ITEM pProgress);
-extern int      hb_UnzipSel(char *szFile,PHB_ITEM pBlock,BOOL bWithPath,char *szPassWord,char *szPath,PHB_ITEM pArray,PHB_ITEM pProgress);
+extern int      hb_UnzipSel(char *szFile,PHB_ITEM pBlock,BOOL bWithPath,char *szPassWord,const char *szPath,PHB_ITEM pArray,PHB_ITEM pProgress);
 extern int      hb_UnzipSelIndex(char *szFile,PHB_ITEM pBlock,BOOL bWithPath,char *szPassWord,char *szPath,PHB_ITEM pSelArray,PHB_ITEM pProgress);
 extern int      hb_DeleteSel(char *szFile,PHB_ITEM pArray,BOOL bCase);
 extern int      hb_TestForPKS(char *szFile);
diff --git a/harbour/contrib/hbzlib/include/zipexception.h b/harbour/contrib/hbzlib/include/zipexception.h
index 569931c153..4b4a87d4e7 100644
--- a/harbour/contrib/hbzlib/include/zipexception.h
+++ b/harbour/contrib/hbzlib/include/zipexception.h
@@ -54,7 +54,7 @@ public:
 */
 		CZipException(int iCause = generic, LPCTSTR lpszZipName = NULL);
 
-		CZipException::CZipException(CZipException& e)
+		CZipException(CZipException& e)
 		{
 			m_szFileName = e.m_szFileName;
 			m_iCause = e.m_iCause;
diff --git a/harbour/contrib/hbzlib/zip.c b/harbour/contrib/hbzlib/zip.c
index e824554e3b..3d24b42421 100644
--- a/harbour/contrib/hbzlib/zip.c
+++ b/harbour/contrib/hbzlib/zip.c
@@ -75,6 +75,7 @@ PHB_ITEM ChangeDiskBlock;
 #define FA_NORMAL         128
 
 extern int Wild2RegEx( char *sWild, char* sRegEx, BOOL bMatchCase );
+extern void hb_fsDirectory( PHB_ITEM pDir, char* szSkleton, char* szAttributes, BOOL bDirOnly, BOOL bFullPath );
 
 #if defined(HB_OS_LINUX)
 
diff --git a/harbour/contrib/hbzlib/zipnew.cpp b/harbour/contrib/hbzlib/zipnew.cpp
index 99e4de7d05..e67d267ce7 100644
--- a/harbour/contrib/hbzlib/zipnew.cpp
+++ b/harbour/contrib/hbzlib/zipnew.cpp
@@ -557,7 +557,7 @@ int hb_DeleteSel( char *szFile, PHB_ITEM pArray, BOOL bCase )
    return ( int ) iReturn;
 }
 
-int hb_UnzipSel( char *szFile, PHB_ITEM pBlock, BOOL lWithPath, char *szPassWord, char *pbyBuffer, PHB_ITEM pSelArray, PHB_ITEM pProgress )
+int hb_UnzipSel( char *szFile, PHB_ITEM pBlock, BOOL lWithPath, char *szPassWord, const char *pbyBuffer, PHB_ITEM pSelArray, PHB_ITEM pProgress )
 {
    bool bWithPath = lWithPath?true:false;
    bool iReturn = true;