diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7487b4e504..5d6a4e649a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,24 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-01 14:11 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added clipper/rtlink/exospace/blinker self-name recognition.
+      clipper will switch it to hbcmp mode,
+      rtlink/exospace/blinker will switch it to hblnk mode.
+      rtlink parameter recognition is yet to be done.
+
+  * contrib/hbct/ctmisc.prg
+    ! Fixed CENTER() to not LTrim() the input string.
+
+  * contrib/hbwin/wapi_commctrl.c
+    ! 0/1 -> FALSE/TRUE
+    ! Fixed to use proper macro instead of hb_parnint().
+    % Using hb_arraySetNL() rather than hb_arraySet().
+
+  * mpkg_win.nsi
+    * Minor.
+
 2009-04-01 10:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * doc/Makefile
     ! Removed license.txt.
diff --git a/harbour/contrib/hbct/ctmisc.prg b/harbour/contrib/hbct/ctmisc.prg
index bdd55510e0..45fd87bcff 100644
--- a/harbour/contrib/hbct/ctmisc.prg
+++ b/harbour/contrib/hbct/ctmisc.prg
@@ -77,7 +77,7 @@ FUNCTION CENTER( c, n, p, lMode )
       DEFAULT lMode TO .F.
    ENDIF
 
-   cRet := PadC( AllTrim( c ), n, p )
+   cRet := PadC( RTrim( c ), n, p )
 
    RETURN iif( lMode, cRet, RTrim( cRet ) )
 
diff --git a/harbour/contrib/hbwin/wapi_commctrl.c b/harbour/contrib/hbwin/wapi_commctrl.c
index eed7394d9c..e58a38f586 100644
--- a/harbour/contrib/hbwin/wapi_commctrl.c
+++ b/harbour/contrib/hbwin/wapi_commctrl.c
@@ -266,12 +266,10 @@ HB_FUNC( WAPI_IMAGELIST_GETICONSIZE )
    {
       hb_storni( cx, 2 );
       hb_storni( cy, 3 );
-      hb_retl( 1 );
+      hb_retl( TRUE );
    }
    else
-   {
-      hb_retl( 0 );
-   }
+      hb_retl( FALSE );
 }
 /*----------------------------------------------------------------------*/
 /*
@@ -514,27 +512,15 @@ HB_FUNC( WAPI_TABCTRL_GETITEMCOUNT )
 
 HB_FUNC( WAPI_TABCTRL_GETITEMRECT )
 {
-   RECT rc;
    PHB_ITEM aRect = hb_itemArrayNew( 4 );
-   PHB_ITEM temp;
+   RECT rc;
 
    ( void ) TabCtrl_GetItemRect( wapi_par_HWND( 1 ), wapi_par_INT( 2 ), &rc );
 
-   temp = hb_itemPutNL( NULL, rc.left );
-   hb_arraySet( aRect, 1, temp );
-   hb_itemRelease( temp );
-
-   temp = hb_itemPutNL( NULL, rc.top );
-   hb_arraySet( aRect, 2, temp );
-   hb_itemRelease( temp );
-
-   temp = hb_itemPutNL( NULL, rc.right );
-   hb_arraySet( aRect, 3, temp );
-   hb_itemRelease( temp );
-
-   temp = hb_itemPutNL( NULL, rc.bottom );
-   hb_arraySet( aRect, 4, temp );
-   hb_itemRelease( temp );
+   hb_arraySetNL( aRect, 1, rc.left );
+   hb_arraySetNL( aRect, 2, rc.top );
+   hb_arraySetNL( aRect, 3, rc.right );
+   hb_arraySetNL( aRect, 4, rc.bottom );
 
    hb_itemReturnRelease( aRect );
 }
@@ -777,11 +763,11 @@ HB_FUNC( WAPI_TABCTRL_GETUNICODEFORMAT )
 HB_FUNC( WAPI_TABCTRL_CREATE )
 {
    HWND hwnd;
-   HWND hbutton;
-   LONG hFont;
    LONG style;
+   LONG hFont;
+   HWND hbutton;
+   hwnd    = ( HWND ) wapi_par_HWND( 1 );
    style   = ( LONG ) hb_parnl( 6 ); /* defaults to 0 */
-   hwnd    = ( HWND ) hb_parnint( 1 );
    hFont   = SendMessage( hwnd, WM_GETFONT, 0, 0 );
    hbutton = CreateWindowEx( 0, WC_TABCONTROL, NULL, style, hb_parni( 2 ), hb_parni( 3 ) , hb_parni( 4 ), hb_parni( 5 ), hwnd, NULL, GetModuleHandle( NULL ), NULL );
    SendMessage( hbutton, ( UINT ) WM_SETFONT, ( WPARAM ) hFont, 1 );
diff --git a/harbour/mpkg_win.nsi b/harbour/mpkg_win.nsi
index c445cb7010..a9610cc43b 100644
--- a/harbour/mpkg_win.nsi
+++ b/harbour/mpkg_win.nsi
@@ -139,8 +139,8 @@ SectionEnd
 ; Descriptions
 
   ; Language strings
-  LangString DESC_hb_main ${LANG_ENGLISH} "Main components."
-  LangString DESC_hb_shortcuts ${LANG_ENGLISH} "Add icons to Start Menu and Desktop."
+  LangString DESC_hb_main ${LANG_ENGLISH} "Main components"
+  LangString DESC_hb_shortcuts ${LANG_ENGLISH} "Add icons to Start Menu and Desktop"
   LangString DESC_hb_examples ${LANG_ENGLISH} "Samples and tests"
 
   ; Assign language strings to sections
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 3d316326e5..9864b988c3 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -375,7 +375,8 @@ FUNCTION Main( ... )
    tmp := Lower( FN_NameGet( hb_argv( 0 ) ) )
    DO CASE
    CASE Right( tmp, 5 ) == "hbcmp" .OR. ;
-        Left(  tmp, 5 ) == "hbcmp"
+        Left(  tmp, 5 ) == "hbcmp" .OR. ;
+        tmp == "clipper"
       t_lInfo := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .T. ; lCreateLib := .F. ; lCreateDyn := .F.
       IF t_lInfo
          OutStd( "hbmk: Enabled -hbcmp option." + hb_osNewLine() )
@@ -387,7 +388,10 @@ FUNCTION Main( ... )
          OutStd( "hbmk: Enabled -hbcc option." + hb_osNewLine() )
       ENDIF
    CASE Right( tmp, 5 ) == "hblnk" .OR. ;
-        Left(  tmp, 5 ) == "hblnk"
+        Left(  tmp, 5 ) == "hblnk" .OR. ;
+        tmp == "rtlink" .OR. ;
+        tmp == "exospace" .OR. ;
+        tmp == "blinker"
       t_lInfo := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .F. ; lAcceptLDFlag := .T.
       IF t_lInfo
          OutStd( "hbmk: Enabled -hblnk option." + hb_osNewLine() )