diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8560daa924..22f57259b5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,13 @@
+2000-06-09 15:30 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+
+   * source/compiler/harbour.l
+     ! Added missing cast on pBuffer assignment to YY_CURRENT_BUFFER
+       in void hb_compSet_YY_CURRENT_BUFFER( void * pBuffer ).
+
+   * source/rdd/dbfntx/dbfntx1.c
+     ! Added several missing type casts on hb_xgrab() calls.
+     * Converted source code from double spaced to single spaced.
+
 2000-06-07 22:50 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>
 
   * include/hbpp.h
diff --git a/harbour/source/compiler/harbour.l b/harbour/source/compiler/harbour.l
index 6e86fc3d5d..68117ba1a1 100644
--- a/harbour/source/compiler/harbour.l
+++ b/harbour/source/compiler/harbour.l
@@ -1783,7 +1783,7 @@ void * hb_compGet_YY_CURRENT_BUFFER()
 
 void hb_compSet_YY_CURRENT_BUFFER( void * pBuffer )
 {
-   YY_CURRENT_BUFFER = pBuffer;
+   YY_CURRENT_BUFFER = ( YY_BUFFER_STATE )pBuffer;
    yy_load_buffer_state();
 }