diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0f89698d01..9ff2bafd52 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,17 @@
+19991122-16:45 EDT David G. Holm <dholm@jsd-llc.com>
+
+   * make_c5x.bat
+     ! Added optional parameter to create a protected mode version of
+       RT_MAIN (the absence of a parameter forces the use of RTLink,
+       while the presence of a parameter forces the use of Exospace).
+
+   * rt_main.prg
+   * rt_str.prg
+     % Changed Comp_STRINGS() to Comp_Str() and Exact_STRINGS()
+       to Exact_Str() in order to allow direct comparison of
+       Clipper and Harbour results (Clipper cuts names off after
+       10 characters).
+
 19991122-17:25 GMT+1 Ryszard Glab <rglab@imid.med.pl>
 
   * source/compiler/harbour.y
diff --git a/harbour/tests/regress/make_c5x.bat b/harbour/tests/regress/make_c5x.bat
index 5c58814cd4..ce7eceb064 100644
--- a/harbour/tests/regress/make_c5x.bat
+++ b/harbour/tests/regress/make_c5x.bat
@@ -12,8 +12,8 @@ clipper rt_math.prg  /w /n
 clipper rt_misc.prg  /w /n
 clipper rt_str.prg   /w /n
 
-rtlink out rt_main fi rt_main, rt_array, rt_date, rt_file, rt_hvm, rt_math, rt_misc, rt_str
+if %1.==. set _=rtlink 
+if not %1.==. set _=exospace
+%_ out rt_main fi rt_main, rt_array, rt_date, rt_file, rt_hvm, rt_math, rt_misc, rt_str
 
 del *.obj
-rt_main.exe > rtl_main.c5x
-
diff --git a/harbour/tests/regress/rt_main.prg b/harbour/tests/regress/rt_main.prg
index 7697b30165..bf795a10c0 100644
--- a/harbour/tests/regress/rt_main.prg
+++ b/harbour/tests/regress/rt_main.prg
@@ -133,8 +133,8 @@ FUNCTION Main( cPar1, cPar2 )
    Main_MATH()
    Main_DATE()
    Main_STRINGS()
-   Comp_STRINGS()
-   Exact_STRINGS()
+   Comp_Str()
+   Exact_Str()
 #ifdef __HARBOUR__
    New_STRINGS()
    Long_STRINGS()
diff --git a/harbour/tests/regress/rt_str.prg b/harbour/tests/regress/rt_str.prg
index dff4deff54..b91ce18d3a 100644
--- a/harbour/tests/regress/rt_str.prg
+++ b/harbour/tests/regress/rt_str.prg
@@ -1079,7 +1079,7 @@ FUNCTION Main_STRINGS()
 
    RETURN NIL
 
-FUNCTION Comp_STRINGS()
+FUNCTION Comp_Str()
    LOCAL old_exact := SET( _SET_EXACT, .F. )
 
    TEST_LINE( "ABC" == "", .F. )
@@ -1191,7 +1191,7 @@ FUNCTION Comp_STRINGS()
    SET( _SET_EXACT, old_exact )
    RETURN NIL
 
-FUNCTION Exact_Strings()
+FUNCTION Exact_Str()
    LOCAL old_exact := SET( _SET_EXACT, .T. )
 
    TEST_LINE( "ABC" == "", .F. )