diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 364ffb300d..361464c818 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-23 12:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbsetup.h
+    * Minor in comment.
+    + Also looking for __DARWIN__ to autodetect HB_OS_DARWIN.
+
+  * utils/hbmk2/hbmk2.prg
+    + Honoring -quiet option for language file creation related screen output.
+
+  * INSTALL
+    * Some improvements.
+
+  * bin/postinst.bat
+    + Added -quiet to hbmk2 cmdlines.
+
 2009-08-23 11:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbwin/axcore.c
     * added automatic activex initialization to __AXDOVERB().
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 10ef973fa1..eadf54260d 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -210,46 +210,57 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
    HB_ALLEGRO_STATIC=yes
    HB_QT_STATIC=yes
 
-   Darwin (OS X)
+   Darwin (Mac OS X)
    -------------
    1.) Install MacPorts, follow their instructions:
        http://www.macports.org/
    2.) sudo port install allegro freeimage gd2 mysql5-devel postgresql83
 
 
-SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS
-===============================================
+SUPPORTED PLATFORMS AND C COMPILERS
+===================================
 
-   You can use HB_ARCHITECURE values shown inside square brackets.
-   You can use below listed abbreviations as HB_COMPILER values.
+   You can use HB_ARCHITECURE values to select platforms:
 
-   Linux [linux]
+   linux   - Linux
+   darwin  - Mac OS X
+   bsd     - *BSD
+   hpux    - HP-UX
+   sunos   - Sun Solaris / OpenSolaris
+   win     - MS Windows
+   wce     - MS Windows CE
+   dos     - MS-DOS (32-bit protected mode only)
+   os2     - OS/2
+
+   You can use HB_COMPILER values to select compilers:
+
+   linux
    -----
    gcc      - GNU C
    watcom   - Open Watcom C++
    icc      - Intel(R) C/C++
    sunpro   - Sun Studio C/C++
 
-   Darwin (OS X) [darwin]
-   -------------
+   darwin
+   ------
    gcc      - GNU C
    icc      - Intel(R) C/C++
 
-   BSD [bsd]
+   bsd
    ---
    gcc      - GNU C
 
-   HP-UX [hpux]
-   -----
+   hpux
+   ----
    gcc      - GNU C
 
-   Solaris [sunos]
-   -------
+   sunos
+   -----
    gcc      - GNU C
    sunpro   - Sun Studio C/C++
 
-   Windows [win]
-   -------
+   win
+   ---
    mingw    - MinGW GNU C 3.4.2 and above
    mingw64  - MinGW GNU C x86-64
    msvc     - Microsoft Visual C++
@@ -267,19 +278,19 @@ SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS
    xcc      - Pelles C for xhb
    cygwin   - Cygwin GNU C
 
-   Windows CE [wce]
-   ----------
+   wce
+   ---
    mingwarm - MinGW GNU C ARM
    msvcarm  - Microsoft Visual C++ ARM
    poccarm  - Pelles C ARM 5.0 and above
 
-   MS-DOS [dos] (32-bit)
-   ------
+   dos
+   ---
    djgpp    - Delorie GNU C
    watcom   - Open Watcom C++ 9.x and above
 
-   OS/2 [os2]
-   ----
+   os2
+   ---
    gcc      - EMX GNU C
    watcom   - Open Watcom C++
 
@@ -328,7 +339,7 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR
                                apply. It's valid to use (back)slashes though.
    - HB_BUILD_PKG=yes          Create release package. Default: no
                                Requires 'clean install' in root source dir.
-                               (currently on Windows/Windows CE/DOS)
+                               (currently on Windows/Windows CE/MS-DOS)
    - HB_BUILD_DLL=no           Create Harbour dynamic libraries. Default: yes
    - HB_BUILD_IMPLIB=yes       Create import libraries for external .dll
                                dependencies (including contribs). Default: no
@@ -612,13 +623,12 @@ EXAMPLES
       make %1 %2 > log.txt
       ---
 
-      --- Delorie GNU C (on Windows NT host)
+      --- Delorie GNU C (on Windows NT (x86) host)
       set DJGPP=C:\djgpp\djgpp.env
       set PATH=C:\djgpp\bin;%PATH%
       rem
       mingw32-make %1 %2 > log.txt 2>&1
       ---
-      [ TOFIX: currently chokes on some cmdline limit. ]
 
       --- Open Watcom C++
       SET WATCOM=C:\watcom
@@ -822,9 +832,9 @@ QUICK START TO BUILD YOUR OWN HARBOUR APPLICATIONS
             'hbmk2 -help'
             Besides the ones listed, you can use all regular Harbour
             compiler command line options, like:
-               -l, -b, -n, -w3 (etc...)
+               '-l', '-b', '-n', '-w3' (etc...)
           - To make it easier to work with Harbour, it's recommended to
-            put Harbour binary dir into the PATH:
+            put Harbour binary directory into the PATH:
                set PATH=C:\harbour\bin;%PATH% (on Windows)
             (this is not a requirement though)
           - You can access hbmk2 using absolute or relative paths, and
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index e77f66bf07..da5de7b72b 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -57,18 +57,18 @@ goto INST_%HB_ARCHITECTURE%
 
       if exist "%HB_BIN_INSTALL%\*.dll" (
          echo ! Making shared version of Harbour binaries...
-         "%HB_HOST_BIN_DIR%\hbmk2" -q0 -lng=en-EN -shared "-o%HB_BIN_INSTALL%\hbrun-dll"    "%~dp0..\utils\hbrun\hbrun.hbp"
-         "%HB_HOST_BIN_DIR%\hbmk2" -q0 -lng=en-EN -shared "-o%HB_BIN_INSTALL%\hbmk2-dll"    "%~dp0..\utils\hbmk2\hbmk2.hbp"
-         "%HB_HOST_BIN_DIR%\hbmk2" -q0 -lng=en-EN -shared "-o%HB_BIN_INSTALL%\hbtest-dll"   "%~dp0..\utils\hbtest\hbtest.hbp"
-         "%HB_HOST_BIN_DIR%\hbmk2" -q0 -lng=en-EN -shared "-o%HB_BIN_INSTALL%\hbi18n-dll"   "%~dp0..\utils\hbi18n\hbi18n.hbp"
-         "%HB_HOST_BIN_DIR%\hbmk2" -q0 -lng=en-EN -shared "-o%HB_BIN_INSTALL%\hbformat-dll" "%~dp0..\utils\hbformat\hbformat.hbp"
+         "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lng=en-EN -shared "-o%HB_BIN_INSTALL%\hbrun-dll"    "%~dp0..\utils\hbrun\hbrun.hbp"
+         "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lng=en-EN -shared "-o%HB_BIN_INSTALL%\hbmk2-dll"    "%~dp0..\utils\hbmk2\hbmk2.hbp"
+         "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lng=en-EN -shared "-o%HB_BIN_INSTALL%\hbtest-dll"   "%~dp0..\utils\hbtest\hbtest.hbp"
+         "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lng=en-EN -shared "-o%HB_BIN_INSTALL%\hbi18n-dll"   "%~dp0..\utils\hbi18n\hbi18n.hbp"
+         "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lng=en-EN -shared "-o%HB_BIN_INSTALL%\hbformat-dll" "%~dp0..\utils\hbformat\hbformat.hbp"
       )
 
    :_SKIP_DLL_BIN
 
    rem ; We build this here, because GNU Make wouldn't add the icon.
    echo ! Making hbrun with application icon...
-   "%HB_HOST_BIN_DIR%\hbmk2" -q0 -lng=en-EN "-o%HB_BIN_INSTALL%\hbrun" "%~dp0..\utils\hbrun\hbrun.hbp"
+   "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lng=en-EN "-o%HB_BIN_INSTALL%\hbrun" "%~dp0..\utils\hbrun\hbrun.hbp"
 
    if "%HB_BUILD_IMPLIB%" == "yes" call "%~dp0hb-mkimp.bat"
    if "%HB_BUILD_PKG%" == "yes" call :MK_PKG
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index fa6b6d08df..fe509150a2 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -287,7 +287,7 @@
 #endif
 
 #ifndef HB_OS_DARWIN
-   #if defined( __APPLE__ )
+   #if defined( __APPLE__ ) || defined( __DARWIN__ )
       #define HB_OS_DARWIN
    #endif
 #endif
@@ -350,6 +350,7 @@
 /* Partially based on:
       http://predef.sourceforge.net/prearch.html
       http://poshlib.hookatooka.com/poshlib/trac.cgi/browser/posh.h
+      [vszakats]
  */
 
 #if   defined( __alpha__ ) || \
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index a8b1ce9613..cc0c3fbcf9 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -6151,18 +6151,20 @@ STATIC PROCEDURE RebuildPO( hbmk, aPOTIN )
       FErase( cPOTemp )
    ENDIF
 
-   IF ! Empty( aNew )
-      IF Empty( hbmk[ _HBMK_aLNG ] ) .OR. !( _LNG_MARKER $ hbmk[ _HBMK_cPO ] )
-         hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created .po file '%1$s'" ), hbmk[ _HBMK_cPO ] ) )
-      ELSE
-         hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created .po file '%1$s' for language(s): %2$s" ), hbmk[ _HBMK_cPO ], ArrayToList( aNew, "," ) ) )
+   IF ! hbmk[ _HBMK_lQuiet ]
+      IF ! Empty( aNew )
+         IF Empty( hbmk[ _HBMK_aLNG ] ) .OR. !( _LNG_MARKER $ hbmk[ _HBMK_cPO ] )
+            hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created .po file '%1$s'" ), hbmk[ _HBMK_cPO ] ) )
+         ELSE
+            hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created .po file '%1$s' for language(s): %2$s" ), hbmk[ _HBMK_cPO ], ArrayToList( aNew, "," ) ) )
+         ENDIF
       ENDIF
-   ENDIF
-   IF ! Empty( aUpd )
-      IF Empty( hbmk[ _HBMK_aLNG ] ) .OR. !( _LNG_MARKER $ hbmk[ _HBMK_cPO ] )
-         hbmk_OutStd( hbmk, hb_StrFormat( I_( "Rebuilt .po file '%1$s'" ), hbmk[ _HBMK_cPO ] ) )
-      ELSE
-         hbmk_OutStd( hbmk, hb_StrFormat( I_( "Rebuilt .po file '%1$s' for language(s): %2$s" ), hbmk[ _HBMK_cPO ], ArrayToList( aUpd, "," ) ) )
+      IF ! Empty( aUpd )
+         IF Empty( hbmk[ _HBMK_aLNG ] ) .OR. !( _LNG_MARKER $ hbmk[ _HBMK_cPO ] )
+            hbmk_OutStd( hbmk, hb_StrFormat( I_( "Rebuilt .po file '%1$s'" ), hbmk[ _HBMK_cPO ] ) )
+         ELSE
+            hbmk_OutStd( hbmk, hb_StrFormat( I_( "Rebuilt .po file '%1$s' for language(s): %2$s" ), hbmk[ _HBMK_cPO ], ArrayToList( aUpd, "," ) ) )
+         ENDIF
       ENDIF
    ENDIF
 
@@ -6238,11 +6240,13 @@ STATIC PROCEDURE MakeHBL( hbmk, cHBL )
       NEXT
    ENDIF
 
-   IF ! Empty( aNew )
-      IF Empty( hbmk[ _HBMK_aLNG ] ) .OR. !( _LNG_MARKER $ cHBL )
-         hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created .hbl file '%1$s'" ), cHBL ) )
-      ELSE
-         hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created .hbl file '%1$s' for language(s): %2$s" ), cHBL, ArrayToList( aNew, "," ) ) )
+   IF ! hbmk[ _HBMK_lQuiet ]
+      IF ! Empty( aNew )
+         IF Empty( hbmk[ _HBMK_aLNG ] ) .OR. !( _LNG_MARKER $ cHBL )
+            hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created .hbl file '%1$s'" ), cHBL ) )
+         ELSE
+            hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created .hbl file '%1$s' for language(s): %2$s" ), cHBL, ArrayToList( aNew, "," ) ) )
+         ENDIF
       ENDIF
    ENDIF