diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8eddb5e60a..42bcf9ede2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,32 @@
+Thu Jul 29 14:46:51 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
+
+	* source/rdd/Makefile: 
+	* source/rdd/dbfntx/Makefile: 
+	Now there is a subdirectory for each database driver. For now,
+	only dbfntx/ is supported. The Makefile in rdd/ walks into each
+	subdirectory.
+	
+	* source/rdd/dbfntx0.prg: 
+	* source/rdd/dbfntx1.c: 
+	* source/rdd/dbfntx/dbfntx0.prg: 
+	* source/rdd/dbfntx/dbfntx1.c: 
+	Moved these files from rdd/ to rdd/dbfntx/.
+
+	* config/bin.cf: 
+	* config/dir.cf: 
+	* config/header.cf: 
+	* config/lib.cf: 
+	* config/test.cf: 
+	* config/dos/djgpp.cf: 
+	* config/linux/gcc.cf: 
+	* config/os2/gcc.cf: 
+	* config/win32/gcc.cf: 
+	* config/win32/msvc.cf: 
+	Added support for the new separate directories for the database
+	driver. The user must define an environment variable HB_DB_DRIVER
+	with the appropriate driver he wants to use. For example, defining
+	it to 'dbfntx' will pick up that driver.
+
 19990729-18:39 CET Victor Szel <info@szelvesz.hu>
   - source/rdd/dbcmd.c
     now redundant declarations removed. (again)
diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf
index eb8ac6f51b..536151666d 100644
--- a/harbour/config/bin.cf
+++ b/harbour/config/bin.cf
@@ -17,7 +17,7 @@ endif
 
 ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
 
-first : dirbase descend
+first:: dirbase descend
 
 descend :
 	@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(EXE_NAME)
diff --git a/harbour/config/dir.cf b/harbour/config/dir.cf
index 49ce316c65..abce79e466 100644
--- a/harbour/config/dir.cf
+++ b/harbour/config/dir.cf
@@ -7,5 +7,5 @@ include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/dir.cf
 
 all : first
 
-first clean install ::
+first clean install::
 	$(DIR_RULE)
diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf
index 3266462fb0..b27efd531d 100644
--- a/harbour/config/dos/djgpp.cf
+++ b/harbour/config/dos/djgpp.cf
@@ -22,8 +22,17 @@ LINKPATHS = $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
 else
 LINKPATHS = -L$(HB_LIB_COMPILE)
 endif
+ifneq ($(HB_DB_DRIVER),)
+LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH)
+LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH)
+endif
+
 LINKLIBS = $(foreach lib, $(LIBS), -l$(lib))
-# LINKLIBS += -lm
+ifneq ($(HB_DB_DRIVER),)
+LINKLIBS += -l$(HB_DB_DRIVER)
+LINKLIBS += -lrdd
+endif
+
 LDFLAGS = $(LINKPATHS)
 
 # Note: The empty line directly before 'endef' HAVE TO exist!
diff --git a/harbour/config/header.cf b/harbour/config/header.cf
index 31df937ce6..c141236a15 100644
--- a/harbour/config/header.cf
+++ b/harbour/config/header.cf
@@ -9,7 +9,7 @@ EXE_ARCH = $(ARCH_DIR)$(EXE_NAME)
 
 ALL_HEADERS = $(C_HEADERS) $(PRG_HEADERS) $(API_HEADERS)
 
-first :
+first::
 
 INSTALL_OBJS = $(ALL_HEADERS)
 INSTALL_DIR = $(HB_INC_INSTALL)
diff --git a/harbour/config/lib.cf b/harbour/config/lib.cf
index 62b5ff29aa..630ff4410f 100644
--- a/harbour/config/lib.cf
+++ b/harbour/config/lib.cf
@@ -19,7 +19,7 @@ endif
 
 ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
 
-first : dirbase descend
+first:: dirbase descend
 
 descend :
 	@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(LIB_NAME)
diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf
index 1a6a6a946b..8774e58bc3 100644
--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -22,8 +22,18 @@ LINKPATHS = $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
 else
 LINKPATHS = -L$(HB_LIB_COMPILE)
 endif
+ifneq ($(HB_DB_DRIVER),)
+LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH)
+LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH)
+endif
+
 LINKLIBS = $(foreach lib, $(LIBS), -l$(lib))
+ifneq ($(HB_DB_DRIVER),)
+LINKLIBS += -l$(HB_DB_DRIVER)
+LINKLIBS += -lrdd
+endif
 LINKLIBS += -lm
+
 LDFLAGS = $(LINKPATHS)
 
 AR = ar
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index 5c594d62c0..78ad12281c 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -22,8 +22,17 @@ LINKPATHS = $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
 else
 LINKPATHS = -L$(HB_LIB_COMPILE)
 endif
+ifneq ($(HB_DB_DRIVER),)
+LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH)
+LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH)
+endif
+
 LINKLIBS = $(foreach lib, $(LIBS), -l$(lib))
-# LINKLIBS += -lm
+ifneq ($(HB_DB_DRIVER),)
+LINKLIBS += -l$(HB_DB_DRIVER)
+LINKLIBS += -lrdd
+endif
+
 LDFLAGS = $(LINKPATHS)
 
 AR = ar
diff --git a/harbour/config/test.cf b/harbour/config/test.cf
index acc4884932..4e340be4e9 100644
--- a/harbour/config/test.cf
+++ b/harbour/config/test.cf
@@ -5,7 +5,7 @@
 include $(TOP)$(ROOT)config/global.cf
 include $(TOP)$(ROOT)config/prg.cf
 
-first : dirbase ^^^d^e^s^c^e^n^d^^^
+first:: dirbase ^^^d^e^s^c^e^n^d^^^
 
 ^^^d^e^s^c^e^n^d^^^ :
 	@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(PRG_EXES)
diff --git a/harbour/config/win32/gcc.cf b/harbour/config/win32/gcc.cf
index 7fa090b9a3..72c53ad6b0 100644
--- a/harbour/config/win32/gcc.cf
+++ b/harbour/config/win32/gcc.cf
@@ -22,8 +22,17 @@ LINKPATHS = $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
 else
 LINKPATHS = -L$(HB_LIB_COMPILE)
 endif
+ifneq ($(HB_DB_DRIVER),)
+LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH)
+LINKPATHS += -L$(TOP)$(ROOT)source/rdd/$(ARCH)
+endif
+
 LINKLIBS = $(foreach lib, $(LIBS), -l$(lib))
-# LINKLIBS += -lm
+ifneq ($(HB_DB_DRIVER),)
+LINKLIBS += -l$(HB_DB_DRIVER)
+LINKLIBS += -lrdd
+endif
+
 LDFLAGS = $(LINKPATHS)
 
 AR = ar
diff --git a/harbour/config/win32/msvc.cf b/harbour/config/win32/msvc.cf
index 7d8a7d5f44..8d11a9009e 100644
--- a/harbour/config/win32/msvc.cf
+++ b/harbour/config/win32/msvc.cf
@@ -22,8 +22,17 @@ LINKPATHS = -link $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$(
 else
 LINKPATHS = -link -LIBPATH:$(HB_LIB_COMPILE)
 endif
+ifneq ($(HB_DB_DRIVER),)
+LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rdd/$(HB_DB_DRIVER)/$(ARCH)
+LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rdd/$(ARCH)
+endif
+
 LINKLIBS = $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
-# LINKLIBS += -lm
+ifneq ($(HB_DB_DRIVER),)
+LINKLIBS += $(HB_DB_DRIVER)$(LIB_EXT)
+LINKLIBS += rdd$(LIB_EXT)
+endif
+
 LDFLAGS = $(LINKPATHS)
 
 AR = lib.exe
diff --git a/harbour/source/rdd/Makefile b/harbour/source/rdd/Makefile
index 65c849102b..45574d73e7 100644
--- a/harbour/source/rdd/Makefile
+++ b/harbour/source/rdd/Makefile
@@ -7,13 +7,15 @@ ROOT = ../../
 C_SOURCES=\
 	dbcmd.c \
         dbf1.c \
-	dbfntx1.c \
 
 PRG_SOURCES=\
         dbf0.prg \
-	dbfntx0.prg \
 	rddsys.prg \
 
 LIB=rdd
 
+DIRS=\
+	dbfntx \
+
 include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/dir.cf
diff --git a/harbour/source/rdd/dbfntx/Makefile b/harbour/source/rdd/dbfntx/Makefile
new file mode 100644
index 0000000000..0a42d4a41b
--- /dev/null
+++ b/harbour/source/rdd/dbfntx/Makefile
@@ -0,0 +1,15 @@
+#
+# $Id$
+#
+
+ROOT = ../../../
+
+C_SOURCES=\
+	dbfntx1.c \
+
+PRG_SOURCES=\
+	dbfntx0.prg \
+
+LIB=dbfntx
+
+include $(TOP)$(ROOT)config/lib.cf
diff --git a/harbour/source/rdd/dbfntx0.prg b/harbour/source/rdd/dbfntx/dbfntx0.prg
similarity index 100%
rename from harbour/source/rdd/dbfntx0.prg
rename to harbour/source/rdd/dbfntx/dbfntx0.prg
diff --git a/harbour/source/rdd/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c
similarity index 100%
rename from harbour/source/rdd/dbfntx1.c
rename to harbour/source/rdd/dbfntx/dbfntx1.c