diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 57de888d1a..06efaec0b8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,10 @@
+19990628-23:30 EDT David G. Holm <dholm@jsd-llc.com>
+  * source/tools/hb_f.c
+    * Undid previous type change for x in hb_hbfskip(), because it
+      causes a serious problem in an attempt to avoid a warning.
+      The strange thing is that GCC (DJGPP) doesn't complain either
+      way, even with -pedantic enabled.
+
 19990628-21:50 EDT David G. Holm <dholm@jsd-llc.com>
   * source/compiler/harbour.y
     * Changed fopen() call used to create .PPO files from using
diff --git a/harbour/source/tools/hb_f.c b/harbour/source/tools/hb_f.c
index 758d210dc7..e4cb2f4a61 100644
--- a/harbour/source/tools/hb_f.c
+++ b/harbour/source/tools/hb_f.c
@@ -102,8 +102,8 @@ long hb_hbfskip( int recs )
 {
 
    long read_pos;
-   size_t x, read_len;
-   long y;
+   size_t read_len;
+   long x, y;
 
 
    if ( recs > 0 ) {