diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 317e8208c1..d23c137825 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-08-07 16:35 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * harbour/source/rtl/achoice.prg
+    + Added functionality for K_MOUSEMOVE.
+      Now if the moouse is moved over the AChoice area,
+      prompt ready for selection will also change, just like
+      in Windows.
+
 2008-08-08 01:10 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * doc/genhtm.sh
      ! Minor fix to previous commit.
diff --git a/harbour/source/rtl/achoice.prg b/harbour/source/rtl/achoice.prg
index 2e1a7fc0c7..f0c170ff7a 100644
--- a/harbour/source/rtl/achoice.prg
+++ b/harbour/source/rtl/achoice.prg
@@ -160,6 +160,16 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
          nPos      := 0
          lFinished := .T.
 
+      CASE nKey == K_MOUSEMOVE
+         nAux := HitTest( nTop, nLeft, nBottom, nRight, MRow(), MCol() )
+         IF nAux != 0 .AND. ( nNewPos := nAtTop + nAux - 1 ) <= nItems .AND. nNewPos != nPos
+            IF Eval( bSelect, alSelect[ nNewPos ] )
+               DispLine( acItems[ nPos ], nTop + ( nPos - nAtTop ), nLeft, Eval( bSelect, alSelect[ nPos ] ), .F., nNumCols )
+               nPos := nNewPos
+               DispLine( acItems[ nPos ], nTop + ( nPos - nAtTop ), nLeft, Eval( bSelect, alSelect[ nPos ] ), .T., nNumCols )
+            ENDIF
+         ENDIF
+  
       CASE nKey == K_LDBLCLK .OR. nKey == K_LBUTTONDOWN
          nAux := HitTest( nTop, nLeft, nBottom, nRight, MRow(), MCol() )
          IF nAux != 0 .AND. ( nNewPos := nAtTop + nAux - 1 ) <= nItems