diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d699fc762d..4d0d261cf0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-03-02 18:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbct/atrepl.c
+    ! Fixed an 'off by one' buffer bug causing GPF in ATREPL().
+      Reported by Alexandr Okhotnikov.
 
 2010-03-02 16:40 UTC+0100 Maurilio Longo (maurilio.longo@libero.it)
    * src/rtl/filesys.c
@@ -32,7 +36,7 @@
 2010-03-02 15:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/gtwin/gtwin.c
     + Implemented HB_GTI_CLOSABLE support for GTWIN.
-      Needs to Windows 2000 or upper.
+      Needs Windows 2000 or upper.
 
 2010-03-02 00:45 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/rddsql/sddodbc/sddodbc.c
diff --git a/harbour/contrib/hbct/atrepl.c b/harbour/contrib/hbct/atrepl.c
index cc91ce391f..aa01079de7 100644
--- a/harbour/contrib/hbct/atrepl.c
+++ b/harbour/contrib/hbct/atrepl.c
@@ -200,7 +200,7 @@ HB_FUNC( ATREPL )
          HB_SIZE ulMatchCounter = 0;
 
          sRetStrLen = sStrLen;
-         pcRetStr = ( char * ) hb_xgrab( sRetStrLen );
+         pcRetStr = ( char * ) hb_xgrab( sRetStrLen + 1 );
          hb_xmemcpy( pcRetStr, pcString, sRetStrLen );
 
          pcRetSubStr = pcRetStr + sIgnore;