diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d343c703a4..167b0dbc0a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+20000513-00:51 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
+
+   * Makefile.bc
+     + added stringsx.c
+   * Makefile.vc
+     + added stringsx.c
+   * source/rtl/Makefile
+     ! fixed tab chars in file (I hope)
+
 20000513-00:19 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
 
    * source/rtl/stringsx.c
diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index 944d89e418..6f3d44ccb9 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -243,6 +243,7 @@ RTL_LIB_OBJS = \
    $(OBJ_DIR)\str.obj \
    $(OBJ_DIR)\strcase.obj \
    $(OBJ_DIR)\strings.obj \
+   $(OBJ_DIR)\stringsx.obj \
    $(OBJ_DIR)\strmatch.obj \
    $(OBJ_DIR)\strtran.obj \
    $(OBJ_DIR)\strzero.obj \
@@ -1417,6 +1418,10 @@ $(OBJ_DIR)\strings.obj : $(RTL_DIR)\strings.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\stringsx.obj : $(RTL_DIR)\stringsx.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\strmatch.obj : $(RTL_DIR)\strmatch.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index a13ab055eb..f79a8ca676 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -10,9 +10,9 @@
 # NOTE: You can use these envvars to configure the make process:
 #       (note that these are all optional)
 #
-#       CFLAGS       - Extra C compiler options for libraries and for 
+#       CFLAGS       - Extra C compiler options for libraries and for
 #                      executables
-#       C_USR        - Extra C compiler options for libraries and for 
+#       C_USR        - Extra C compiler options for libraries and for
 #                      executables (GNU make compatible envvar)
 #       CLIBFLAGS    - Extra C compiler options for the libraries
 #       HARBOURFLAGS - Extra Harbour compiler options
@@ -273,6 +273,7 @@ RTL_LIB_OBJS = \
    $(OBJ_DIR)\str.obj \
    $(OBJ_DIR)\strcase.obj \
    $(OBJ_DIR)\strings.obj \
+   $(OBJ_DIR)\stringsx.obj \
    $(OBJ_DIR)\strmatch.obj \
    $(OBJ_DIR)\strtran.obj \
    $(OBJ_DIR)\strzero.obj \
@@ -349,7 +350,7 @@ LANG_LIB_OBJS = \
    $(OBJ_DIR)\msghuwin.obj \
    $(OBJ_DIR)\msgis850.obj \
    $(OBJ_DIR)\msgpt.obj \
-   $(OBJ_DIR)\msgro.obj 
+   $(OBJ_DIR)\msgro.obj
 
 #
 # MACRO.LIB rules
@@ -540,7 +541,7 @@ VM_LIB_OBJS = \
 
 GTPCA_LIB_OBJS = \
    $(OBJ_DIR)\gtpca.obj \
-   $(OBJ_DIR)\mousepca.obj 
+   $(OBJ_DIR)\mousepca.obj
 
 #
 # GTSTD.LIB rules
@@ -551,7 +552,7 @@ GTPCA_LIB_OBJS = \
 
 GTSTD_LIB_OBJS = \
    $(OBJ_DIR)\gtstd.obj \
-   $(OBJ_DIR)\mousestd.obj 
+   $(OBJ_DIR)\mousestd.obj
 
 #
 # GTWIN.LIB rules
@@ -562,7 +563,7 @@ GTSTD_LIB_OBJS = \
 
 GTWIN_LIB_OBJS = \
    $(OBJ_DIR)\gtwin.obj \
-   $(OBJ_DIR)\mousewin.obj 
+   $(OBJ_DIR)\mousewin.obj
 
 #
 # Our default target
diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile
index 20ed8fae4f..dcbcdd040c 100644
--- a/harbour/source/rtl/Makefile
+++ b/harbour/source/rtl/Makefile
@@ -1,311 +1,155 @@
 #
-
 # $Id$
-
 #
 
-
-
 ROOT = ../../
 
-
-
 C_SOURCES=\
-
 	abs.c        \
-
 	accept.c     \
-
 	ampm.c       \
-
 	at.c         \
-
 	binnum.c     \
-
 	binnumx.c    \
-
 	box.c        \
-
 	chrasc.c     \
-
 	colorind.c   \
-
 	console.c    \
-
 	copyfile.c   \
-
 	datec.c      \
-
 	dates.c      \
-
 	dateshb.c    \
-
 	datesx.c     \
-
 	defpath.c    \
-
 	descend.c    \
-
 	dir.c        \
-
 	dirdrive.c   \
-
 	diskspac.c   \
-
 	do.c         \
-
 	empty.c      \
-
 	errorapi.c   \
-
 	filesys.c    \
-
 	fkmax.c      \
-
 	fnsplit.c    \
-
 	fssize.c     \
-
 	fstemp.c     \
-
 	gete.c       \
-
 	gt.c         \
-
 	gtapi.c      \
-
 	gx.c         \
-
 	hardcr.c     \
-
 	inkey.c      \
-
 	is.c         \
-
 	isprint.c    \
-
 	langapi.c    \
-
 	left.c       \
-
 	len.c        \
-
 	lennum.c     \
-
 	math.c       \
-
 	maxrow.c     \
-
 	memofile.c   \
-
 	memoline.c   \
-
 	minmax.c     \
-
 	mlcount.c    \
-
 	mlpos.c      \
-
 	mod.c        \
-
 	mouseapi.c   \
-
 	mousex.c     \
-
 	mtran.c      \
-
 	natmsg.c     \
-
 	net.c        \
-
 	oemansi.c    \
-
 	oldbox.c     \
-
 	oldclear.c   \
-
 	pad.c        \
-
 	padc.c       \
-
 	padl.c       \
-
 	padr.c       \
-
 	philes.c     \
-
 	philes53.c   \
-
 	philesx.c    \
-
 	rat.c        \
-
 	replic.c     \
-
 	right.c      \
-
 	round.c      \
-
 	run.c        \
-
 	samples.c    \
-
 	saverest.c   \
-
 	scroll.c     \
-
 	seconds.c    \
-
 	set.c        \
-
 	setcolor.c   \
-
 	setcurs.c    \
-
 	setpos.c     \
-
 	setposbs.c   \
-
 	shadow.c     \
-
 	soundex.c    \
-
 	space.c      \
-
 	str.c        \
-
 	strcase.c    \
-
 	strings.c    \
-
 	stringsx.c   \
-
 	strmatch.c   \
-
 	strtran.c    \
-
 	strzero.c    \
-
 	stuff.c      \
-
 	substr.c     \
-
 	tone.c       \
-
 	trace.c      \
-
 	transfrm.c   \
-
 	trim.c       \
-
 	type.c       \
-
 	val.c        \
-
 	valtostr.c   \
-
 	valtype.c    \
-
 	version.c    \
-
 	word.c       \
-
 	xhelp.c      \
-
 	xsavescr.c   \
 
-
-
 PRG_SOURCES=\
-
 	achoice.prg  \
-
 	adir.prg     \
-
 	alert.prg    \
-
 	browdb.prg   \
-
 	browdbx.prg  \
-
 	browse.prg   \
-
 	dbedit.prg   \
-
 	devoutp.prg  \
-
 	dircmd.prg   \
-
 	dummy.prg    \
-
 	errorsys.prg \
-
 	fieldbl.prg  \
-
 	getlist.prg  \
-
 	getsys.prg   \
-
 	input.prg    \
-
 	memoedit.prg \
-
 	memvarbl.prg \
-
 	menuto.prg   \
-
 	objfunc.prg  \
-
 	readkey.prg  \
-
 	readvar.prg  \
-
 	setfunc.prg  \
-
 	setkey.prg   \
-
 	setta.prg    \
-
 	tclass.prg   \
-
 	tbcolumn.prg \
-
 	tbrowse.prg  \
-
 	teditor.prg  \
-
 	terror.prg   \
-
 	text.prg     \
-
 	tget.prg     \
-
 	tgetlist.prg \
-
 	tlabel.prg   \
-
 	treport.prg  \
-
 	typefile.prg \
-
 	wait.prg     \
 
-
-
 LIBNAME=rtl
 
-
-
 # The list of all valid GT drivers is defined in config/<arch>/global.cf.
-
 DIRS=$(HB_GT_LIBS)
 
-
-
 include $(TOP)$(ROOT)config/lib.cf
-
 include $(TOP)$(ROOT)config/dir.cf
 
-
-
-
\ No newline at end of file