diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3bc9717ecd..3d13c13f4e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,11 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+2002-06-05 18:00 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+  * source/rtl/gtwin/gtwin.c
+    ! Fixed Esc key translation problem that only occurred in some
+       international versions of Windows, thanks to data provided
+       by "Walter Negro - FOEESITRA" <waltern@foeesitra.org.ar>
 
 2002-06-05 23:30 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
    * contrib
diff --git a/harbour/source/rtl/gtwin/gtwin.c b/harbour/source/rtl/gtwin/gtwin.c
index fa730ff822..7d8904a19a 100644
--- a/harbour/source/rtl/gtwin/gtwin.c
+++ b/harbour/source/rtl/gtwin/gtwin.c
@@ -412,6 +412,12 @@ int hb_gt_ReadKey( HB_inkey_enum eventmask )
                #ifdef HB_DEBUG_KEYBOARD
                   fprintf( stdout, "0" );
                #endif
+               if( ch == 0 && wChar == 27)
+               {
+                  /* Fix for escape key problem with some international
+                     keyboards and/or international versions of Windows */
+                  ch = 27;
+               }
                if( ( ( ch == 0 || ch == -32 || ch == -16 ) && ( dwState & ( SHIFT_PRESSED | LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED ) ) )
                || ( ( dwState & ( ENHANCED_KEY | LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED ) ) ) )
                {