diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index dcd150dbb6..3c6ac8c8ca 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-26 20:11 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
+   * source/pp/ppcomp.c
+     ! Fixed line number to ignore empty lines in #include files,when resuming parent file.
+
 2000-06-26 23:05 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
    * source/pp/ppcore.c
         *fixed some problems, appeared after last fix and
diff --git a/harbour/source/pp/ppcomp.c b/harbour/source/pp/ppcomp.c
index 8142b9dbc9..e5d8515042 100644
--- a/harbour/source/pp/ppcomp.c
+++ b/harbour/source/pp/ppcomp.c
@@ -204,10 +204,6 @@ int hb_pp_Internal( FILE * handl_o, char * sOut )
            if( hb_comp_files.iFiles == 2 )
            {
            }
-           /* Save line number for the last #include line
-           hb_comp_iIncLine = hb_comp_files.pLast->iLine - 1;
-           */
-           /* Ron Pinkas end 2000-06-23 */
 
            /* we close the currently include file and continue */
            fclose( hb_comp_files.pLast->handle );
@@ -221,6 +217,10 @@ int hb_pp_Internal( FILE * handl_o, char * sOut )
            hb_comp_iLine = hb_comp_files.pLast->iLine;
            */
 
+           /* Ron Pinkas added 2000-06-26 */
+           hb_pp_nEmptyStrings = 0;
+           /* Ron Pinkas end 2000-06-26 */
+
            hb_comp_files.iFiles--;
            lLine = 1;
         }
@@ -236,7 +236,7 @@ int hb_pp_Internal( FILE * handl_o, char * sOut )
 
   if( lLine )
   {
-     sprintf( ptrOut, "#line %d \"%s\"", ( hb_comp_files.pLast->iLine + hb_pp_nEmptyStrings ) , hb_comp_files.pLast->szFileName );
+     sprintf( ptrOut, "#line %d \"%s\"", ( hb_comp_files.pLast->iLine ) , hb_comp_files.pLast->szFileName );
      while( *ptrOut ) ptrOut++;
 
      /* Ron Pinkas added 2000-06-14 */