diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 102385e030..6891d1b464 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,49 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-17 19:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/none.mk
+  * config/global.mk
+  * config/bsd/gcc.mk
+  * config/lib.mk
+  * config/wce/mingwarm.mk
+  * config/wce/poccarm.mk
+  * config/wce/msvcarm.mk
+  * config/bin.mk
+  * config/dir.mk
+  * config/hpux/gcc.mk
+  * config/darwin/gcc.mk
+  * config/dos/watcom.mk
+  * config/dos/djgpp.mk
+  * config/win/xcc.mk
+  * config/win/mingw.mk
+  * config/win/msvc64.mk
+  * config/win/iccia64.mk
+  * config/win/pocc.mk
+  * config/win/bcc.mk
+  * config/win/watcom.mk
+  * config/win/mingw64.mk
+  * config/win/msvcia64.mk
+  * config/win/gcc.mk
+  * config/win/pocc64.mk
+  * config/win/icc.mk
+  * config/win/cygwin.mk
+  * config/win/msvc.mk
+  * config/header.mk
+  * config/linux/watcom.mk
+  * config/linux/gcc.mk
+  * config/linux/icc.mk
+  * config/linux/sunpro.mk
+  * config/os2/watcom.mk
+  * config/os2/gcc.mk
+  * config/sunos/gcc.mk
+  * config/sunos/sunpro.mk
+  * config/doc.mk
+  * config/install.mk
+    * Renaming .cf files to .mk.
+      Pass 2. Changing .cf references to .mk ones inside config.
+      SVN is in non-working state yet.
+
 2009-08-17 19:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   - config/prg.cf
   + config/dirsh.mk
diff --git a/harbour/config/bin.mk b/harbour/config/bin.mk
index dd529987c9..1720736c8c 100644
--- a/harbour/config/bin.mk
+++ b/harbour/config/bin.mk
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
@@ -52,9 +52,9 @@ HB_LIBS_TPL :=
 _HB_RDD :=
 _HB_VM :=
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).cf
-include $(TOP)$(ROOT)config/c.cf
-include $(TOP)$(ROOT)config/prg.cf
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).mk
+include $(TOP)$(ROOT)config/c.mk
+include $(TOP)$(ROOT)config/prg.mk
 
 BIN_NAME :=
 
@@ -86,7 +86,7 @@ $(BIN_NAME) : $(ALL_OBJS)
 INSTALL_FILES := $(BIN_FILE)
 INSTALL_DIR := $(HB_BIN_INSTALL)
 
-include $(TOP)$(ROOT)config/install.cf
+include $(TOP)$(ROOT)config/install.mk
 
 endif
 endif
diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk
index e9680a2bd9..4b0c64949a 100644
--- a/harbour/config/bsd/gcc.mk
+++ b/harbour/config/bsd/gcc.mk
@@ -78,4 +78,4 @@ AR := ar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/darwin/gcc.mk b/harbour/config/darwin/gcc.mk
index 47e262acb4..e47ef8caa6 100644
--- a/harbour/config/darwin/gcc.mk
+++ b/harbour/config/darwin/gcc.mk
@@ -89,4 +89,4 @@ AR := libtool
 ARFLAGS :=
 AR_RULE = $(AR) -static $(ARFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/dir.mk b/harbour/config/dir.mk
index a9353c7bab..152aa4ac48 100644
--- a/harbour/config/dir.mk
+++ b/harbour/config/dir.mk
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
@@ -18,7 +18,7 @@ else
 endif
 
 ifeq ($(JOB_SRV),NO)
-   include $(TOP)$(ROOT)config/dirsh.cf
+   include $(TOP)$(ROOT)config/dirsh.mk
 endif
 
 ifeq ($(DIR_RULE),)
diff --git a/harbour/config/doc.mk b/harbour/config/doc.mk
index 6057194623..427f674e46 100644
--- a/harbour/config/doc.mk
+++ b/harbour/config/doc.mk
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
@@ -16,7 +16,7 @@ else
 INSTALL_FILES := $(DOC_FILES)
 INSTALL_DIR := $(HB_DOC_INSTALL)$(DOC_SUBDIR)
 
-include $(TOP)$(ROOT)config/install.cf
+include $(TOP)$(ROOT)config/install.mk
 endif
 endif
 endif
diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk
index 0d2c7d6ad2..ac857d2607 100644
--- a/harbour/config/dos/djgpp.mk
+++ b/harbour/config/dos/djgpp.mk
@@ -88,4 +88,4 @@ AR_RULE = $(create_library)
 
 LD_RULE = $(link_exe_file)
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/dos/watcom.mk b/harbour/config/dos/watcom.mk
index b33c58120f..11e2a5fe6a 100644
--- a/harbour/config/dos/watcom.mk
+++ b/harbour/config/dos/watcom.mk
@@ -127,7 +127,7 @@ AR_RULE = $(create_library)
 # disable DOS/4GW Banner
 export DOS4G := quiet
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
 
 # work arround to DOS command line size limit
 export HARBOURCMD := $(HB_FLAGS)
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index df623a4348..a4ea8679e6 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -619,7 +619,7 @@ endif
 # Assemble relative path from OBJ_DIR to source.
 GRANDP := $(subst $(subst x,x, ),,$(foreach item, $(subst /, ,$(OBJ_DIR)), ../))
 
-# TODO: Set this in <arch>/<comp>.cf
+# TODO: Set this in <arch>/<comp>.mk
 HB_CPU :=
 ifeq ($(HB_ARCHITECTURE),win)
    ifeq ($(HB_COMPILER),msvc64)
@@ -956,8 +956,8 @@ endif
 
 export HB_INIT_DONE := yes
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
-include $(TOP)$(ROOT)config/globsh.cf
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.mk
+include $(TOP)$(ROOT)config/globsh.mk
 
 endif
 
diff --git a/harbour/config/header.mk b/harbour/config/header.mk
index ae255320b9..98d16a7ab8 100644
--- a/harbour/config/header.mk
+++ b/harbour/config/header.mk
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
@@ -16,7 +16,7 @@ else
 INSTALL_FILES := $(C_HEADERS) $(PRG_HEADERS) $(API_HEADERS)
 INSTALL_DIR := $(HB_INC_INSTALL)
 
-include $(TOP)$(ROOT)config/install.cf
+include $(TOP)$(ROOT)config/install.mk
 endif
 
 endif
diff --git a/harbour/config/hpux/gcc.mk b/harbour/config/hpux/gcc.mk
index 97bd0fda36..302e2c4b5b 100644
--- a/harbour/config/hpux/gcc.mk
+++ b/harbour/config/hpux/gcc.mk
@@ -80,4 +80,4 @@ AR := ar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/install.mk b/harbour/config/install.mk
index 9d3f473e0f..e48baf7ccb 100644
--- a/harbour/config/install.mk
+++ b/harbour/config/install.mk
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/instsh.cf
+include $(TOP)$(ROOT)config/instsh.mk
 
 ifneq ($(INSTALL_RULE),)
 ifneq ($(HB_INSTALL_DEF),yes)
diff --git a/harbour/config/lib.mk b/harbour/config/lib.mk
index 73784fa3a3..d22ca5e438 100644
--- a/harbour/config/lib.mk
+++ b/harbour/config/lib.mk
@@ -2,16 +2,16 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
 
 HB_DYN_LIBS := hbcommon hbpp hbrtl hbmacro hblang hbcpage hbpcre hbzlib hbextern hbrdd rddntx rddnsx rddcdx rddfpt hbsix hbhsx hbusrrdd gtcgi gtpca gtstd gtwvt gtgui gtwin hbvm hbvmmt hbmaindllh
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).cf
-include $(TOP)$(ROOT)config/c.cf
-include $(TOP)$(ROOT)config/prg.cf
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).mk
+include $(TOP)$(ROOT)config/c.mk
+include $(TOP)$(ROOT)config/prg.mk
 
 LIB_NAME := $(LIB_PREF)$(LIBNAME)$(LIB_EXT)
 
@@ -31,7 +31,7 @@ $(LIB_NAME) : $(ALL_OBJS)
 INSTALL_FILES := $(LIB_FILE)
 INSTALL_DIR := $(HB_LIB_INSTALL)
 
-include $(TOP)$(ROOT)config/install.cf
+include $(TOP)$(ROOT)config/install.mk
 
 endif
 endif
diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk
index 4b074e86ab..c592af857f 100644
--- a/harbour/config/linux/gcc.mk
+++ b/harbour/config/linux/gcc.mk
@@ -83,4 +83,4 @@ AR := $(HB_CCPREFIX)ar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/linux/icc.mk b/harbour/config/linux/icc.mk
index bdd67a1a7f..c03e21f786 100644
--- a/harbour/config/linux/icc.mk
+++ b/harbour/config/linux/icc.mk
@@ -88,4 +88,4 @@ AR := xiar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk
index 5a957327e9..5ca50b9380 100644
--- a/harbour/config/linux/sunpro.mk
+++ b/harbour/config/linux/sunpro.mk
@@ -44,8 +44,6 @@ endif
 # we have to use this option also for static libraries and binaries
 CFLAGS += -KPIC
 
-# in HB_ISAOPT we may have platform dependent settings set in different
-# sunpro*.cf files
 export HB_ISAOPT
 
 CFLAGS += $(HB_ISAOPT)
@@ -107,4 +105,4 @@ AR := $(HB_CCPREFIX)ar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/linux/watcom.mk b/harbour/config/linux/watcom.mk
index 9dd1ab3be1..241ddfc0fe 100644
--- a/harbour/config/linux/watcom.mk
+++ b/harbour/config/linux/watcom.mk
@@ -85,4 +85,4 @@ AR := wlib
 ARFLAGS := -q -c -n
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file))
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/none.mk b/harbour/config/none.mk
index ef62641f81..a588c3fb6c 100644
--- a/harbour/config/none.mk
+++ b/harbour/config/none.mk
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index b84238e38f..9e187adc37 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -91,4 +91,4 @@ AR := ar
 ARFLAGS :=
 AR_RULE = $(create_library) & $(RM) __lib__.tmp
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/os2/watcom.mk b/harbour/config/os2/watcom.mk
index 407c818276..d324dc885f 100644
--- a/harbour/config/os2/watcom.mk
+++ b/harbour/config/os2/watcom.mk
@@ -108,4 +108,4 @@ AR := wlib
 ARFLAGS := -q -p=64 -c -n
 AR_RULE = $(create_library)
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/sunos/gcc.mk b/harbour/config/sunos/gcc.mk
index 0c45692e64..24341cd7e5 100644
--- a/harbour/config/sunos/gcc.mk
+++ b/harbour/config/sunos/gcc.mk
@@ -78,4 +78,4 @@ AR := ar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk
index aa825ed579..392c0c1adc 100644
--- a/harbour/config/sunos/sunpro.mk
+++ b/harbour/config/sunos/sunpro.mk
@@ -50,8 +50,6 @@ else
    CFLAGS += -KPIC
 endif
 
-# in HB_ISAOPT we may have platform dependent settings set in different
-# sunpro*.cf files
 export HB_ISAOPT
 
 CFLAGS += $(HB_ISAOPT)
@@ -108,4 +106,4 @@ AR := ar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/wce/mingwarm.mk b/harbour/config/wce/mingwarm.mk
index eb99e628b5..6137ea62ae 100644
--- a/harbour/config/wce/mingwarm.mk
+++ b/harbour/config/wce/mingwarm.mk
@@ -46,4 +46,4 @@ AR := $(HB_CCPREFIX)ar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk
index c13d79c3e7..2c0656f736 100644
--- a/harbour/config/wce/msvcarm.mk
+++ b/harbour/config/wce/msvcarm.mk
@@ -67,4 +67,4 @@ AR := lib.exe
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/wce/poccarm.mk b/harbour/config/wce/poccarm.mk
index ccee308c01..05dd95a511 100644
--- a/harbour/config/wce/poccarm.mk
+++ b/harbour/config/wce/poccarm.mk
@@ -54,4 +54,4 @@ AR := polib.exe
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F)
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk
index f25ed0abb1..4da6671bf6 100644
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -78,4 +78,4 @@ else # sh
 
 endif
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/win/cygwin.mk b/harbour/config/win/cygwin.mk
index 9c8c9e84d8..e045626b0b 100644
--- a/harbour/config/win/cygwin.mk
+++ b/harbour/config/win/cygwin.mk
@@ -45,4 +45,4 @@ AR := ar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/win/gcc.mk b/harbour/config/win/gcc.mk
index 1c936a4fac..81f5fec9d5 100644
--- a/harbour/config/win/gcc.mk
+++ b/harbour/config/win/gcc.mk
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/mingw.cf
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/mingw.mk
diff --git a/harbour/config/win/icc.mk b/harbour/config/win/icc.mk
index 48e3e05fd3..578fd7496c 100644
--- a/harbour/config/win/icc.mk
+++ b/harbour/config/win/icc.mk
@@ -52,4 +52,4 @@ AR := xilib.exe
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/win/iccia64.mk b/harbour/config/win/iccia64.mk
index 4c6b73b916..5c48ba228f 100644
--- a/harbour/config/win/iccia64.mk
+++ b/harbour/config/win/iccia64.mk
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/icc.cf
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/icc.mk
diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk
index cee3b64250..1572a02749 100644
--- a/harbour/config/win/mingw.mk
+++ b/harbour/config/win/mingw.mk
@@ -55,4 +55,4 @@ AR := $(HB_CCPREFIX)ar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/win/mingw64.mk b/harbour/config/win/mingw64.mk
index 1c936a4fac..81f5fec9d5 100644
--- a/harbour/config/win/mingw64.mk
+++ b/harbour/config/win/mingw64.mk
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/mingw.cf
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/mingw.mk
diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk
index 997ebc587a..c2860b4541 100644
--- a/harbour/config/win/msvc.mk
+++ b/harbour/config/win/msvc.mk
@@ -63,4 +63,4 @@ AR := lib.exe
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/win/msvc64.mk b/harbour/config/win/msvc64.mk
index 39ebd52769..53f05a9eeb 100644
--- a/harbour/config/win/msvc64.mk
+++ b/harbour/config/win/msvc64.mk
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/msvc.cf
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/msvc.mk
diff --git a/harbour/config/win/msvcia64.mk b/harbour/config/win/msvcia64.mk
index 39ebd52769..53f05a9eeb 100644
--- a/harbour/config/win/msvcia64.mk
+++ b/harbour/config/win/msvcia64.mk
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/msvc.cf
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/msvc.mk
diff --git a/harbour/config/win/pocc.mk b/harbour/config/win/pocc.mk
index c1fe623c4e..b3e1044fcc 100644
--- a/harbour/config/win/pocc.mk
+++ b/harbour/config/win/pocc.mk
@@ -49,4 +49,4 @@ AR := polib.exe
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F)
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/win/pocc64.mk b/harbour/config/win/pocc64.mk
index a97292c4d1..560c69dea8 100644
--- a/harbour/config/win/pocc64.mk
+++ b/harbour/config/win/pocc64.mk
@@ -2,6 +2,6 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/pocc.cf
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/pocc.mk
 
 CPPFLAGS += /Tamd64-coff
diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk
index 5dcbc85a44..ae08a45f86 100644
--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -115,4 +115,4 @@ AR := wlib
 ARFLAGS := -q -p=64 -c -n
 AR_RULE = $(create_library)
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/win/xcc.mk b/harbour/config/win/xcc.mk
index cca176b03f..eb4689f32b 100644
--- a/harbour/config/win/xcc.mk
+++ b/harbour/config/win/xcc.mk
@@ -42,4 +42,4 @@ AR := xlib.exe
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F)
 
-include $(TOP)$(ROOT)config/rules.cf
+include $(TOP)$(ROOT)config/rules.mk