diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f4a902ab56..8b78f0e157 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-01 01:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/wapi_shellapi.c
+    ! WAPI_USERISANADMIN() -> WAPI_ISUSERANADMIN()
+
+  * utils/hbmk2/hbmk2.prg
+    ! Added RTRIM() to MEMOLINE() calls to strip right space paddings.
+
 2009-12-01 01:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbwince.h
   * harbour/contrib/hbwin/axcore.c
diff --git a/harbour/contrib/hbwin/wapi_shellapi.c b/harbour/contrib/hbwin/wapi_shellapi.c
index aaf4e22788..ba7cbac576 100644
--- a/harbour/contrib/hbwin/wapi_shellapi.c
+++ b/harbour/contrib/hbwin/wapi_shellapi.c
@@ -96,7 +96,7 @@ HB_FUNC( WAPI_SHELLEXECUTE )
 #endif
 }
 
-HB_FUNC( WAPI_USERISANADMIN )
+HB_FUNC( WAPI_ISUSERANADMIN )
 {
    BOOL bResult = FALSE;
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 3e5e6fba6b..c93a3a9823 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -7932,7 +7932,7 @@ STATIC PROCEDURE OutOpt( aOpt )
       aOpt[ 2 ] := StrTran( aOpt[ 2 ], "\n", hb_osNewLine() )
       nLines := MLCount( aOpt[ 2 ], MaxCol() - 21 )
       FOR nLine := 1 TO nLines
-         IF ! Empty( tmp := MemoLine( aOpt[ 2 ], MaxCol() - 21, nLine ) )
+         IF ! Empty( tmp := RTrim( MemoLine( aOpt[ 2 ], MaxCol() - 21, nLine ) ) )
             IF nLine == 1
                OutStd( PadR( Space( 2 ) + aOpt[ 1 ], 21 ) )
             ELSE
@@ -7953,7 +7953,7 @@ STATIC PROCEDURE OutNote( cText )
    cText := StrTran( cText, "\n", hb_osNewLine() )
    nLines := MLCount( cText, MaxCol() - 4 )
    FOR nLine := 1 TO nLines
-      IF ! Empty( tmp := MemoLine( cText, MaxCol() - 4, nLine ) )
+      IF ! Empty( tmp := RTrim( MemoLine( cText, MaxCol() - 4, nLine ) ) )
          IF nLine == 1
             OutStd( PadR( "  -", 4 ) )
          ELSE
@@ -7973,7 +7973,7 @@ STATIC PROCEDURE hbmk_OutStd( cText )
    cText := StrTran( cText, "\n", hb_osNewLine() )
    nLines := MLCount( cText, MaxCol() - 7 )
    FOR nLine := 1 TO nLines
-      IF ! Empty( tmp := MemoLine( cText, MaxCol() - 7, nLine ) )
+      IF ! Empty( tmp := RTrim( MemoLine( cText, MaxCol() - 7, nLine ) ) )
          IF nLine == 1
             OutStd( PadR( "hbmk2:", 7 ) )
          ELSE
@@ -7993,7 +7993,7 @@ STATIC PROCEDURE hbmk_OutErr( cText )
    cText := StrTran( cText, "\n", hb_osNewLine() )
    nLines := MLCount( cText, MaxCol() - 7 )
    FOR nLine := 1 TO nLines
-      IF ! Empty( tmp := MemoLine( cText, MaxCol() - 7, nLine ) )
+      IF ! Empty( tmp := RTrim( MemoLine( cText, MaxCol() - 7, nLine ) ) )
          IF nLine == 1
             OutErr( PadR( "hbmk2:", 7 ) )
          ELSE