diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4021d9c603..e9b9e8d783 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-06-03 11:07 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * examples/rl/rl.hbp
+    + Added options to create running rl executable.
+
+  * source/rtl/achoice.prg
+    ! Fixed strange and undocumented ACHOICE() calling convention
+      used in RLDIALG.PRG from RL tool supplied with Clipper 5.x
+      versions. In this case the user function is passed as 6th
+      parameter.
+
+  * INSTALL
+    + Added note that when compiling for mingw without msys, sh.exe
+      of msys musn't be in the PATH, otherwise the build won't work.
+
 2009-06-03 12:30 UTC+0300 Alexander Kresin <alex at belacy.belgorod.su>
   * utils/hbformat/hbformat.prg
     ! Warning fixed.
@@ -38,7 +52,7 @@
 2009-06-03 07:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * INSTALL
     * One 'sf.net' URL changed to sourceforge.net.
-      (for consistency only. both name works.)
+      (for consistency only. both names work.)
 
   * utils/hbmk2/hbmk2.prg
     * Formatting.
@@ -57,13 +71,13 @@
       to reach better code optimization
 
   * harbour/include/hbclass.ch
-    + added support for xbase++ compatible method declaration by:
+    + added support for Xbase++ compatible method declaration by:
          METHOD <methodName1> [ , <methodNameN> ]
 
   * harbour/source/rtl/tthreadx.prg
     * redirect parameters passed to ::new() method to ::init() method
       as emulation for class object new method
-    + added basic support for ::setInterval in xbasee++ THREAD class
+    + added basic support for ::setInterval in Xbase++ THREAD class
 
   * harbour/tests/speedtst.prg
     ! removed unused variable cDir
diff --git a/harbour/INSTALL b/harbour/INSTALL
index defc7989e4..88d6cb234e 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -70,11 +70,12 @@ HOW TO BUILD AND INSTALL HARBOUR
       > hello
       You should see 'Hello world!' on screen.
 
-      NOTE: <DIR> is your destination directory where executables,
-            libraries and headers will be created. Use absolute paths
-            only. For a peace of mind, avoid using spaces, quotes
-            in the name. You can leave it empty, in this case the
-            results will be created under the current directory tree.
+      NOTES: - <DIR> is your destination directory where executables,
+               libraries and headers will be created. Use absolute paths
+               only. For a peace of mind, avoid using spaces, quotes
+               in the name. You can leave it empty, in this case the
+               results will be created under the current directory tree.
+             - With mingw, sh.exe (part of msys) mustn't be in the PATH.
 
    Windows with MinGW + msys
    -------------------------
@@ -354,7 +355,7 @@ EXAMPLES
       call make_gnu.bat %1 %2 > log-%HB_COMPILER%.txt 2>&1
       ---
 
-      --- MinGW GCC
+      --- MinGW GCC (make sure msys (sh.exe) isn't in the PATH)
       set PATH=C:\devl\MinGW-440\bin;%PATH%
       rem
       set HB_COMPILER=mingw
diff --git a/harbour/examples/rl/rl.hbp b/harbour/examples/rl/rl.hbp
index 8b59b44088..3916e2ff8c 100644
--- a/harbour/examples/rl/rl.hbp
+++ b/harbour/examples/rl/rl.hbp
@@ -2,6 +2,10 @@
 # $Id$
 #
 
+-orl
+-m -n
+-main=setup
+
 RLBACK.PRG
 RLDIALG.PRG
 RLFRONT.PRG
diff --git a/harbour/source/rtl/achoice.prg b/harbour/source/rtl/achoice.prg
index 41cc72de45..7b19f6150e 100644
--- a/harbour/source/rtl/achoice.prg
+++ b/harbour/source/rtl/achoice.prg
@@ -48,6 +48,16 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
 
    ColorSelect( CLR_STANDARD )
 
+   /* NOTE: Undocumented parameter passing handled. ACHOICE()
+            is called in such way in RLDIALG.PRG from RL tool
+            supplied with Clipper 5.x. 6th parameter is the
+            user function and 7th parameter is zero (empty I
+            suppose). [vszakats] */
+   IF Empty( xUserFunc ) .AND. ValType( xSelect ) $ "CB"
+      xUserFunc := xSelect
+      xSelect := NIL
+   ENDIF
+
    lUserFunc := !Empty( xUserFunc ) .AND. ValType( xUserFunc ) $ "CB"
 
 
@@ -107,7 +117,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
    DO WHILE !lFinished
 
       IF nMode != AC_GOTO .AND. nMode != AC_NOITEM
-         nKey  := Inkey( 0 ) 
+         nKey  := Inkey( 0 )
          nMode := AC_IDLE
       ENDIF