diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5f4fc40ff9..bc1d1a905d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-03-20 10:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  - contrib/hbbzip2
+  + contrib/hbbz2
+  * contrib/Makefile
+  * contrib/hbbz2/hbbzip2.hbc
+    * Renaming hbbzip2 to hbbz2 (pass 1/2)
+
 2010-03-20 10:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * bin/postinst.bat
     ! Fixed recent change. 'HB_BUILD_SHARED=yes' means to create
diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile
index 50fcf6bbab..33ecf977ac 100644
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -8,7 +8,7 @@ ROOT := ../
 DIRS := \
    gtwvg \
    hbbtree \
-   hbbzip2 \
+   hbbz2 \
    hbclipsm \
    hbct \
    hbfoxpro \
diff --git a/harbour/contrib/hbbzip2/Makefile b/harbour/contrib/hbbz2/Makefile
similarity index 100%
rename from harbour/contrib/hbbzip2/Makefile
rename to harbour/contrib/hbbz2/Makefile
diff --git a/harbour/contrib/hbbzip2/hbbzip2.c b/harbour/contrib/hbbz2/hbbzip2.c
similarity index 100%
rename from harbour/contrib/hbbzip2/hbbzip2.c
rename to harbour/contrib/hbbz2/hbbzip2.c
diff --git a/harbour/contrib/hbbzip2/hbbzip2.ch b/harbour/contrib/hbbz2/hbbzip2.ch
similarity index 100%
rename from harbour/contrib/hbbzip2/hbbzip2.ch
rename to harbour/contrib/hbbz2/hbbzip2.ch
diff --git a/harbour/contrib/hbbzip2/hbbzip2.hbc b/harbour/contrib/hbbz2/hbbzip2.hbc
similarity index 71%
rename from harbour/contrib/hbbzip2/hbbzip2.hbc
rename to harbour/contrib/hbbz2/hbbzip2.hbc
index ca205d46a7..7799bfebda 100644
--- a/harbour/contrib/hbbzip2/hbbzip2.hbc
+++ b/harbour/contrib/hbbz2/hbbzip2.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=hbbzip2
+libs=hbbz2
 libs=bz2
diff --git a/harbour/contrib/hbbzip2/tests/hbmk.hbm b/harbour/contrib/hbbz2/tests/hbmk.hbm
similarity index 100%
rename from harbour/contrib/hbbzip2/tests/hbmk.hbm
rename to harbour/contrib/hbbz2/tests/hbmk.hbm
diff --git a/harbour/contrib/hbbzip2/tests/test.prg b/harbour/contrib/hbbz2/tests/test.prg
similarity index 100%
rename from harbour/contrib/hbbzip2/tests/test.prg
rename to harbour/contrib/hbbz2/tests/test.prg