diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d2908c00e1..789a01ba82 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-08 13:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * package/harbour.spec
+    - Deleted hbformat. It now resides in contrib.
+
+  * doc/dirstruc.txt
+    * Moved hbformat.
+
+  * contrib/hbformat/utils/hbformat.hbp
+    * Reimplemented tweak to build hbformat in shared mode for
+      win/wce/os2 systems. (to minimize distro size)
+
 2011-01-08 13:05 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbformat/hbformac.c
     ! Formatted with uncrustify.
diff --git a/harbour/contrib/hbformat/utils/hbformat.hbp b/harbour/contrib/hbformat/utils/hbformat.hbp
index 6e54681bb4..7a31257d50 100644
--- a/harbour/contrib/hbformat/utils/hbformat.hbp
+++ b/harbour/contrib/hbformat/utils/hbformat.hbp
@@ -10,6 +10,10 @@
 
 hbformat.prg
 
+# Always build in shared mode for these platforms because the
+# tool is included in std distro and we want to minimize its size.
+{!(HB_BUILD_DYN='no')&(win|wce|os2)}-shared
+
 -ldflag={allmsvc}-nxcompat
 -ldflag={allmsvc}-dynamicbase
 -ldflag={allmsvc}-fixed:no
diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt
index e26a5cf487..beb89222fb 100644
--- a/harbour/doc/dirstruc.txt
+++ b/harbour/doc/dirstruc.txt
@@ -76,6 +76,8 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |       |
 |   |       +-imgs_out  - Output directory used by the test program.
 |   |
+|   +---hbformat        - Harbour Source Formatter utility.
+|   |
 |   +---hbgd            - HBGD wrapper for gdLibrary.
 |   |   |
 |   |   +---doc         - Help and license files.
@@ -384,8 +386,6 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   +---rddtest         - RDD tests.
 |
 +---utils               - Utilities and tools that are part of Harbour.
-    |
-    +---hbformat        - Harbour Source Formatter utility.
     |
     +---hbi18n          - Harbour i18n .pot/.hbl file manager.
     |
diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec
index b80ffcd6aa..e9268f0691 100644
--- a/harbour/package/harbour.spec
+++ b/harbour/package/harbour.spec
@@ -86,7 +86,7 @@
 Summary:        Free software Clipper compatible compiler
 Summary(pl):    Darmowy kompilator kompatybilny z językiem Clipper.
 Summary(pt_BR): Um compilador Clipper compativel Gratis
-Summary(ru):    Свободный компилятор, совместимый с языком Clipper.
+Summary(ru):    ????????? ??????????, ??????????? ? ?????? Clipper.
 Summary(hu):    Szabad szoftver Clipper kompatibilis fordító
 Name:           %{name}
 Version:        %{version}
@@ -118,9 +118,9 @@ Esse pacote contem um compilador, um pré-processador, arquivos de cabeçalho
 uma maquina virtual e documentaçăo.
 
 %description -l ru
-%{dname} - многоплатформенный компилятор, совместимый с языком CA-Cl*pper.
-Этот пакет содержит компилятор, препроцессор, файлы заголовков, виртуальную
-машину и документацию.
+%{dname} - ?????????????????? ??????????, ??????????? ? ?????? CA-Cl*pper.
+???? ????? ???????? ??????????, ????????????, ????? ??????????, ???????????
+?????? ? ????????????.
 
 %description -l hu
 %{dname} egy több platformon is működő CA-Cl*pper kompatibilis
@@ -134,7 +134,7 @@ fordítóprogram. A csomag része a fordító maga, az előfordító, fejléc
 %package lib
 Summary:        Shared runtime libaries for %{dname} compiler
 Summary(pl):    Dzielone bilioteki dla kompilatora %{dname}
-Summary(ru):    Совместно используемые библиотеки для компилятора %{dname}
+Summary(ru):    ????????? ???????????? ?????????? ??? ??????????? %{dname}
 Summary(hu):    Megosztott könyvtárak a(z) %{dname} fordítóhoz
 Group:          Development/Languages
 Provides:       lib%{name}.so lib%{name}mt.so
@@ -155,9 +155,9 @@ Esse pacote %{dname} provem as bibliotecas compartilhadas para programas
 linkados dinamicamente.
 
 %description -l ru lib
-%{dname} - компилятор, совместимый с языком CA-Cl*pper.
-Этот пакет содержит совместно используемые библиотеки %{dname},
-необходимые для работы динамически скомпонованных программ.
+%{dname} - ??????????, ??????????? ? ?????? CA-Cl*pper.
+???? ????? ???????? ????????? ???????????? ?????????? %{dname},
+??????????? ??? ?????? ??????????? ?????????????? ????????.
 
 %description -l hu lib
 A(z) %{dname} egy Clipper kompatibilis fordítóprogram.
@@ -172,7 +172,7 @@ programokhoz szükséges megosztott (dinamikus) futtatókönyvtárakat.
 Summary:        Contrib runtime libaries for %{dname} compiler
 Summary(pl):    Bilioteki z drzewa contrib dla kompilatora %{dname}
 Summary(pt_BR): Libs contrib para %{dname}
-Summary(ru):    Библиотеки из дерева contrib для компилятора %{dname}
+Summary(ru):    ?????????? ?? ?????? contrib ??? ??????????? %{dname}
 Summary(hu):    Kiegészítő könyvtárak a(z) %{dname} fordítóhoz
 Group:          Development/Languages
 Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -192,8 +192,8 @@ Esse pacote %{dname} provem as bibliotecas contrib para linkagem
 dos programas.
 
 %description -l ru contrib
-%{dname} - компилятор, совместимый с языком CA-Cl*pper.
-Этот пакет содержит статические библиотеки %{dname} из дерева contrib.
+%{dname} - ??????????, ??????????? ? ?????? CA-Cl*pper.
+???? ????? ???????? ??????????? ?????????? %{dname} ?? ?????? contrib.
 
 %description -l hu contrib
 A(z) %{dname} egy Clipper kompatibilis fordítóprogram.
@@ -455,7 +455,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hbtest
 %{_bindir}/hbrun
 %{_bindir}/hbi18n
-%{_bindir}/hbformat
 %{_bindir}/hbmk2
 %{_bindir}/hbmk2.*.hbl
 %{_bindir}/hb3rdpat.hbs