diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7f5db72eed..b655a3626a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,8 +1,12 @@
+19990817-15:36 EDT Paul Tucker <ptucker@sympatico.ca>
+   * source/debug/tbrwtext.prg
+     * modified to with with cr/lf or just lf
+
 19990817-21:10 GMT+1 Antonio Linares <alinares@fivetech.com>
    * source/rtl/errorsys.prg
      * public getlist := {} uncommented.
 
-19990816-12:26 EDT Paul Tucker <ptucker@sympatico.ca>
+19990817-14:26 EDT Paul Tucker <ptucker@sympatico.ca>
    * source/debug/Makefile
      + tbrwtext.prg
 
diff --git a/harbour/source/debug/tbrwtext.prg b/harbour/source/debug/tbrwtext.prg
index 11a300a7d8..c80f292a43 100644
--- a/harbour/source/debug/tbrwtext.prg
+++ b/harbour/source/debug/tbrwtext.prg
@@ -107,7 +107,8 @@ static function FReadLn( nHandle, cBuffer )
    nSaveFPos = FSeek( nHandle, 0, FS_RELATIVE )
    nRead     = FRead( nHandle, @cBuffer, MAX_LINE_LEN )
 
-   if ( nEOL := At( Chr( 13 ) + Chr( 10 ), SubStr( cBuffer, 1, nRead ) ) ) == 0
+   if ( nEOL := At( Chr( 13 ) + Chr( 10 ), SubStr( cBuffer, 1, nRead ) ) ) == 0 .and. ;
+      ( nEOL := At( Chr( 10 ), SubStr( cBuffer, 1, nRead ) ) ) == 0
       // Line overflow or eof
       // ::cLine has the line we need
    else
@@ -146,9 +147,8 @@ static function GoPrevLine( nHandle, cLine, nFileSize )
       cBuff := Space( nMaxRead )
       nNewPos := FSeek( nHandle, -nMaxRead, FS_RELATIVE )
       FRead( nHandle, @cBuff, nMaxRead )
-      nWhereCrLf := RAt( Chr( 13 ) + Chr( 10 ), cBuff )
-
-      if nWhereCrLf == 0
+      if (nWhereCrLf := RAt( Chr( 13 ) + Chr( 10 ), cBuff ) ) == 0 .and. ;
+         (nWhereCrLf := RAt( Chr( 10 ), cBuff ) ) == 0
          nPrev := nNewPos
          cLine = cBuff
       else