diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 583581854f..053a6cc644 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
     * Now works properly on linux
+  * utils/hbmake/hbmake.prg
+    utils/hbmake/hbmutils.prg
+    * Some fixes for linux
+  * source/rtl/listbox.prg
+    * Some formatting
+
+2002-01-10 14:30 UTC-0500 David G. Holm <dholm@jsd-llc.com>
+  * source/rtl/spfiles.c
+    ! Fix to remove spurious ISCHAR(1) tests from C routines.
       From Horacio Roldán <harbour_ar@yahoo.com.ar>
 
 2002-01-10 17:20 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
@@ -634,6 +643,7 @@
      * Cleaned up the new Win32 API branches.
 
 2001-12-21 12:54 UTC+0100 Antonio Linares <alinares@fivetech.com>
+
    * source/pp/pragma.c
    * contrib/dot/pp_harb.ch
    * tests/inline_c.prg
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index d7818fe6a9..278729f79d 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -310,6 +310,17 @@
    #endif
 #endif
 
+/* ***********************************************************************
+ * Here you can force the EOL string to be CRLF
+ *
+ * By default, the EOL string depends upon the detected platform.
+*/
+/* #define HB_EOL_CRLF */
+#ifdef HB_EOL_CRLF
+   #undef OS_EOL_LEN
+   #define OS_EOL_LEN 2
+#endif
+
 /* ***********************************************************************
  * See also the following files for task specific definitions/settings
  *
@@ -326,3 +337,4 @@
 #endif
 
 #endif /* HB_SETUP_H_ */
+
diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c
index cfc502319a..eb18ec1aa1 100644
--- a/harbour/source/rtl/console.c
+++ b/harbour/source/rtl/console.c
@@ -93,7 +93,7 @@ void hb_conInit( void )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_conInit()"));
 
-#if defined(OS_UNIX_COMPATIBLE)
+#if defined(OS_UNIX_COMPATIBLE) && !defined(HB_EOL_CRLF)
    s_szCrLf[ 0 ] = HB_CHAR_LF;
    s_szCrLf[ 1 ] = '\0';
 #else
@@ -518,3 +518,5 @@ HB_FUNC( DISPOUTAT ) /* writes a single value to the screen at speficic position
          hb_xfree( pszString );
    }
 }
+
+