diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 438be8152e..937f17dad7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,88 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-23 17:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * doc/linux1st.txt
+    - Deleted Linux build instructions no more relevant.
+    * Formatting. Probably this file should be moved into INSTALL.
+
+  * doc/gmake.txt
+    * Little updates.
+
+  * harbour-win-spec
+  * doc/gmake.txt
+  * doc/linux1st.txt
+  * doc/whatsnew.txt
+  * harbour-wce-spec
+  * INSTALL
+  * bin/hb-mkdyn.sh
+  * bin/postinst.cmd
+  * bin/postinst.bat
+  * bin/hb-func.sh
+  * bin/postinst.sh
+  * external/sqlite3/Makefile
+  * external/libhpdf/Makefile
+  * external/libpng/Makefile
+  * mpkg_tgz.sh
+  * harbour.spec
+  * source/pp/hbpp.c
+  * source/pp/Makefile
+  * source/vm/Makefile
+  * source/vm/cmdarg.c
+  * source/vm/vmmt/Makefile
+  * source/main/harbour.c
+  * source/rtl/gtdos/Makefile
+  * source/rtl/gtwin/Makefile
+  * source/rtl/gtcrs/Makefile
+  * source/rtl/gttrm/Makefile
+  * source/rtl/Makefile
+  * source/rtl/gtos2/Makefile
+  * source/rtl/gtgui/Makefile
+  * source/rtl/gtwvt/Makefile
+  * source/rdd/Makefile
+  * source/Makefile
+  * contrib/hbodbc/Makefile
+  * contrib/hbsqlit3/Makefile
+  * contrib/hbblat/Makefile
+  * contrib/hbqt/Makefile
+  * contrib/hbxbp/Makefile
+  * contrib/hbcurl/Makefile
+  * contrib/gtqtc/Makefile
+  * contrib/rddsql/sddodbc/Makefile
+  * contrib/rddado/Makefile
+  * contrib/gtwvg/Makefile
+  * contrib/rddads/Makefile
+  * contrib/hbfimage/Makefile
+  * contrib/hbtip/Makefile
+  * contrib/hbwin/Makefile
+  * contrib/hbssl/Makefile
+  * utils/hbmk2/hbmk2.pt_BR.po
+  * utils/hbmk2/hbmk2.hu_HU.po
+  * config/none.mk
+  * config/global.mk
+  * config/lib.mk
+  * config/wce/mingw.mk
+  * config/bin.mk
+  * config/dir.mk
+  * config/common/watcom.mk
+  * config/win/msvc64.mk
+  * config/win/iccia64.mk
+  * config/win/mingw64.mk
+  * config/win/gcc.mk
+  * config/win/msvcia64.mk
+  * config/win/pocc64.mk
+  * config/header.mk
+  * config/dyn.mk
+  * config/doc.mk
+    * HB_ARCHITECTURE -> HB_PLATFORM
+    * hb_arch -> hb_plat (internal script variable)
+    * ARCH_COMP -> PLAT_COMP (internal make variable)
+    ; INCOMPATIBLE: Please update your environment, if you used this setting.
+    ; NOTE: So now Harbour uses only two names for platforms: 'OS' and 'platform'.
+            'Architecture' is nowhere used to refer to as an operating system
+            anymore. 'Architecture' is only used to refer to CPU/hardware
+            architecture.
+
 2009-08-23 17:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * doc/gmake.txt
   * doc/man/hbmk.1
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 6a7bf9db86..2c49d5ed3d 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -86,9 +86,9 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE
                in the name. You can leave it empty, in this case the
                results will be created under the current directory tree.
              - You can also use *nix hosts to create Windows builds:
-                  $ make HB_ARCHITECTURE=win
+                  $ make HB_PLATFORM=win
              - You can also use *nix hosts to create Windows CE builds.
-                  $ make HB_ARCHITECTURE=wce
+                  $ make HB_PLATFORM=wce
 
    Windows with MSYS or Cygwin shells
    ----------------------------------
@@ -217,7 +217,7 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
 SUPPORTED PLATFORMS AND C COMPILERS
 ===================================
 
-   You can use HB_ARCHITECTURE values to select platforms:
+   You can use HB_PLATFORM values to select platforms:
 
    linux   - Linux
    darwin  - Mac OS X
@@ -302,9 +302,9 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR
    General
    -------
    - HB_COMPILER               Override C compiler autodetection
-   - HB_ARCHITECTURE           Override platform autodetection
+   - HB_PLATFORM               Override platform autodetection
                                See this section for possible values:
-                               SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS
+                               SUPPORTED PLATFORMS AND C COMPILERS
 
    - HB_USER_PRGFLAGS          User Harbour compiler options
    - HB_USER_CFLAGS            User C compiler options
@@ -680,7 +680,7 @@ EXAMPLES
       rem ; Native Windows Harbour binaries need to be installed on this path
       set HB_BIN_COMPILE=C:\hb-watcom\bin
       rem
-      set HB_ARCHITECTURE=os2
+      set HB_PLATFORM=os2
       set HB_COMPILER=watcom
       mingw32-make %1 %2 > log.txt 2>&1
       ---
@@ -697,7 +697,7 @@ EXAMPLES
       # ; Native Linux binaries need to be installed on this path
       export HB_BIN_COMPILE="/tmp/cross-hb"
       # ;
-      export HB_ARCHITECTURE=os2
+      export HB_PLATFORM=os2
       export HB_COMPILER=watcom
       export HB_INSTALL_PREFIX="$(pwd)/hb-os2/watcom"
       make "$@"
@@ -715,7 +715,7 @@ EXAMPLES
       rem ; Native Windows Harbour binaries need to be installed on this path
       set HB_BIN_COMPILE=C:\hb-watcom\bin
       rem
-      set HB_ARCHITECTURE=linux
+      set HB_PLATFORM=linux
       set HB_COMPILER=watcom
       mingw32-make %1 %2 > log.txt 2>&1
       ---
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 615c73fc48..3f320efb41 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -89,7 +89,7 @@ mk_hbgetlibs()
     if [ -z "$@" ]
     then
         libs=""
-        if [ "$HB_ARCHITECTURE" != "wce" ]
+        if [ "$HB_PLATFORM" != "wce" ]
         then
             libs="$libs gtwin"
         fi
@@ -106,7 +106,7 @@ mk_hbgetlibsctb()
     if [ -z "$@" ]
     then
         libs=""
-        if [ "$HB_ARCHITECTURE" = "wce" ]
+        if [ "$HB_PLATFORM" = "wce" ]
         then
             libs="$libs gtwin"
         fi
@@ -125,14 +125,14 @@ mk_hbtools()
     hb_pref="$4"
     [ -z "${hb_pref}" ] && hb_pref="${HB_TOOLS_PREF-hb}"
     hb_cmpname="${HB_CMPNAME-harbour}"
-    if [ "${HB_ARCHITECTURE}" = "dos" ]; then
+    if [ "${HB_PLATFORM}" = "dos" ]; then
         hb_tool="$1/${hb_pref}-bld"
         hb_path_separator=";"
         hb_static="yes"
         hb_static_default=" (default)"
         hb_exesuf=".exe"
-    elif [ "${HB_ARCHITECTURE}" = "win" ] || \
-         [ "${HB_ARCHITECTURE}" = "wce" ]; then
+    elif [ "${HB_PLATFORM}" = "win" ] || \
+         [ "${HB_PLATFORM}" = "wce" ]; then
         hb_tool="$1/${hb_pref}-build"
         hb_path_separator=":"
         if [ "${HB_MK_STATIC}" = "yes" ]; then
@@ -143,7 +143,7 @@ mk_hbtools()
             hb_shared_default=" (default)"
         fi
         hb_exesuf=".exe"
-    elif [ "${HB_ARCHITECTURE}" = "darwin" ]; then
+    elif [ "${HB_PLATFORM}" = "darwin" ]; then
         hb_tool="$1/${hb_pref}-build"
         hb_path_separator=":"
         if [ "${HB_MK_STATIC}" = "yes" ]; then
@@ -200,13 +200,13 @@ mk_hbtools()
         HB_WITHOUT_X11="yes"
     else
         HB_CRS_LIB=""
-        if [ "${HB_ARCHITECTURE}" = "linux" ]; then
+        if [ "${HB_PLATFORM}" = "linux" ]; then
             HB_SYS_LIBS="${HB_SYS_LIBS} -ldl -lrt"
-        elif [ "${HB_ARCHITECTURE}" = "sunos" ]; then
+        elif [ "${HB_PLATFORM}" = "sunos" ]; then
             HB_SYS_LIBS="${HB_SYS_LIBS} -lrt"
             HB_SYS_LIBS="${HB_SYS_LIBS} -lsocket -lnsl -lresolv"
             HB_CRS_LIB="curses"
-        elif [ "${HB_ARCHITECTURE}" = "hpux" ]; then
+        elif [ "${HB_PLATFORM}" = "hpux" ]; then
             HB_SYS_LIBS="${HB_SYS_LIBS} -lrt"
         fi
         if [ -n "${HB_CURSES_VER}" ]; then
@@ -238,7 +238,7 @@ mk_hbtools()
     fi
 
     hb_hbmkcfg="$1/hbmk.cfg"
-    hb_mkdef="{${HB_ARCHITECTURE}&${HB_COMPILER}}"
+    hb_mkdef="{${HB_PLATFORM}&${HB_COMPILER}}"
     echo "Generating ${hb_hbmkcfg}... "
     echo "# Harbour Make (hbmk2) configuration"> ${hb_hbmkcfg}
     echo "# Generated by Harbour build process">> ${hb_hbmkcfg}
@@ -281,7 +281,7 @@ mk_hbtools()
 #
 
 # set environment variables
-export HB_ARCHITECTURE="${HB_ARCHITECTURE}"
+export HB_PLATFORM="${HB_PLATFORM}"
 export HB_COMPILER="${HB_COMPILER}"
 [ -z "\${HB_BIN_INSTALL}" ] && export HB_BIN_INSTALL="${_DEFAULT_BIN_DIR}"
 [ -z "\${HB_INC_INSTALL}" ] && export HB_INC_INSTALL="${_DEFAULT_INC_DIR}"
@@ -329,7 +329,7 @@ elif [ "\$*" = "mk-links" ]; then
     if [ "\${DIR}" != "\${NAME}" ]; then
         (cd "\${DIR}"
         for n in ${hb_pref}cc ${hb_pref}cmp ${hb_pref}mk ${hb_pref}lnk; do
-            if [ "\${HB_ARCHITECTURE}" = "dos" ]; then
+            if [ "\${HB_PLATFORM}" = "dos" ]; then
                 cp -f "\${NAME}" "\${n}"
             else
                 ln -sf "\${NAME}" "\${n}"
@@ -355,7 +355,7 @@ HB_MT=""
 HB_GT="${HB_GT_LIB#gt}"
 
 if [ -z "$HB_GPM_MOUSE" ]; then
-    if [ "$HB_ARCHITECTURE" = "linux" ] && \
+    if [ "$HB_PLATFORM" = "linux" ] && \
        ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then
         HB_GPM_MOUSE=yes
     else
@@ -366,7 +366,7 @@ fi
 
 if [ -z "${HB_WITHOUT_GTSLN}" ]; then
     HB_WITHOUT_GTSLN=yes
-    case "$HB_ARCHITECTURE" in
+    case "$HB_PLATFORM" in
         linux|bsd|darwin|hpux|sunos)
             for dir in /usr /usr/local /sw /opt/local
             do
@@ -381,7 +381,7 @@ fi
 
 if [ -z "${HB_WITHOUT_GTCRS}" ]; then
     HB_WITHOUT_GTCRS=yes
-    case "$HB_ARCHITECTURE" in
+    case "$HB_PLATFORM" in
         linux|bsd|darwin|hpux|sunos)
             for dir in /usr /usr/local /sw /opt/local
             do
@@ -479,7 +479,7 @@ esac
 SYSTEM_LIBS="${HB_SYS_LIBS}"
 # use pthread system library for MT programs
 if [ "\${HB_MT}" = "MT" ]; then
-    case "\${HB_ARCHITECTURE}" in
+    case "\${HB_PLATFORM}" in
         dos|win|wce|os2)
             ;;
         *)
@@ -498,9 +498,9 @@ GCC_PATHS="\${HB_PATHS} -L\${HB_LIB_INSTALL}"
 
 HB_GPM_LIB=""
 if [ -f "\${HB_LIB_INSTALL}/libgtsln.a" ]; then
-    if [ "\${HB_ARCHITECTURE}" = "darwin" ]; then
+    if [ "\${HB_PLATFORM}" = "darwin" ]; then
         SYSTEM_LIBS="\${SYSTEM_LIBS} -L/sw/lib -L/opt/local/lib"
-    elif [ "\${HB_ARCHITECTURE}" = "bsd" ]; then
+    elif [ "\${HB_PLATFORM}" = "bsd" ]; then
         SYSTEM_LIBS="\${SYSTEM_LIBS} -L/usr/local/lib"
     fi
     SYSTEM_LIBS="-l${HB_SLN_LIB:-slang} \${SYSTEM_LIBS}"
@@ -520,8 +520,8 @@ fi
 
 
 if [ "\${HB_STATIC}" = "no" ] && \
-   [ "\${HB_ARCHITECTURE}" != "win" ] && \
-   [ "\${HB_ARCHITECTURE}" != "wce" ]; then
+   [ "\${HB_PLATFORM}" != "win" ] && \
+   [ "\${HB_PLATFORM}" != "wce" ]; then
     SYSTEM_LIBS=""
 fi
 
@@ -534,7 +534,7 @@ elif [ "\${HB_HWGUI}" = "yes" ]; then
 fi
 
 if [ "\${HB_STATIC}" = "full" ]; then
-    if [ "\${HB_ARCHITECTURE}" = "linux" ]; then
+    if [ "\${HB_PLATFORM}" = "linux" ]; then
         SYSTEM_LIBS="\${SYSTEM_LIBS} -lpthread -ldl"
     fi
     LN_OPT="\${LN_OPT} -static"
@@ -561,16 +561,16 @@ if [ "\${HB_STATIC}" = "yes" ]; then
     libs="${hb_libs} ${hb_libsc}"
 else
     l="${name}"
-    if [ "\${HB_ARCHITECTURE}" = "darwin" ]; then
+    if [ "\${HB_PLATFORM}" = "darwin" ]; then
         pref="lib"
         ext=".dylib"
         LN_OPT="\${LN_OPT} -bind_at_load -multiply_defined suppress"
-    elif [ "\${HB_ARCHITECTURE}" = "win" ] || \
-         [ "\${HB_ARCHITECTURE}" = "wce" ]; then
+    elif [ "\${HB_PLATFORM}" = "win" ] || \
+         [ "\${HB_PLATFORM}" = "wce" ]; then
         pref=""
         ext=".dll"
         HB_LNK_ATTR="__attribute__ ((dllimport))"
-    elif [ "\${HB_ARCHITECTURE}" = "hpux" ]; then
+    elif [ "\${HB_PLATFORM}" = "hpux" ]; then
         pref="lib"
         ext=".sl"
     else
@@ -612,9 +612,9 @@ fi
 if [ "\${HB_HWGUI}" = "yes" ]; then
     HARBOUR_LIBS="\${HARBOUR_LIBS} -lhwgui -lprocmisc -lhbxml"
 fi
-if [ "\${HB_ARCHITECTURE}" = "darwin" ] || \\
-   [ "\${HB_ARCHITECTURE}" = "sunos" ] || \\
-   [ "\${HB_ARCHITECTURE}" = "hpux" ]; then
+if [ "\${HB_PLATFORM}" = "darwin" ] || \\
+   [ "\${HB_PLATFORM}" = "sunos" ] || \\
+   [ "\${HB_PLATFORM}" = "hpux" ]; then
     HARBOUR_LIBS="\${HARBOUR_LIBS} \${HARBOUR_LIBS}"
 else
     HARBOUR_LIBS="-Wl,--start-group \${HARBOUR_LIBS} -Wl,--end-group"
@@ -642,9 +642,9 @@ if [ -n "\${l}" ]; then
     [ -f "\${HB_LIB_INSTALL}/lib\${l}.a" ] && HARBOUR_LIBS="\${HARBOUR_LIBS} -l\${l}"
 fi
 
-if [ "\${HB_ARCHITECTURE}" = "darwin" ]; then
+if [ "\${HB_PLATFORM}" = "darwin" ]; then
     CC_OPT="\${CC_OPT} -no-cpp-precomp -Wno-long-double"
-elif [ "\${HB_ARCHITECTURE}" = "sunos" ]; then
+elif [ "\${HB_PLATFORM}" = "sunos" ]; then
     HB_STRIP="no"
 fi
 
@@ -774,8 +774,8 @@ mk_hblibso()
     name=`get_solibname`
     hb_rootdir="${1-.}"
 
-    if [ "${HB_ARCHITECTURE}" = "win" ] || \
-       [ "${HB_ARCHITECTURE}" = "wce" ]; then
+    if [ "${HB_PLATFORM}" = "win" ] || \
+       [ "${HB_PLATFORM}" = "wce" ]; then
        hb_ver=`get_hbver_win "${hb_rootdir}"`
     else
        hb_ver=`get_hbver "${hb_rootdir}"`
@@ -805,19 +805,19 @@ mk_hblibso()
         linker_options="${linker_options} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32 -loleaut32"
     elif [ "${HB_COMPILER}" = "djgpp" ]; then
         linker_options="${linker_options}"
-    elif [ "${HB_ARCHITECTURE}" = "linux" ]; then
+    elif [ "${HB_PLATFORM}" = "linux" ]; then
         linker_options="${linker_options} -ldl -lrt"
         linker_mtoptions="${linker_mtoptions} -lpthread"
-    elif [ "${HB_ARCHITECTURE}" = "sunos" ]; then
+    elif [ "${HB_PLATFORM}" = "sunos" ]; then
         linker_options="${linker_options} -lrt -lsocket -lnsl -lresolv"
         linker_mtoptions="${linker_mtoptions} -lpthread"
-    elif [ "${HB_ARCHITECTURE}" = "hpux" ]; then
+    elif [ "${HB_PLATFORM}" = "hpux" ]; then
         linker_options="${linker_options} -lrt"
         linker_mtoptions="${linker_mtoptions} -lpthread"
-    elif [ "${HB_ARCHITECTURE}" = "bsd" ]; then
+    elif [ "${HB_PLATFORM}" = "bsd" ]; then
         linker_options="$-L/usr/local/lib {linker_options}"
         linker_mtoptions="${linker_mtoptions} -lpthread"
-    elif [ "${HB_ARCHITECTURE}" = "darwin" ]; then
+    elif [ "${HB_PLATFORM}" = "darwin" ]; then
         linker_options="-L/sw/lib -L/opt/local/lib ${linker_options}"
         linker_mtoptions="${linker_mtoptions} -lpthread"
     fi
@@ -842,7 +842,7 @@ mk_hblibso()
                 then
                     LIBS="$LIBS $ls"
                     if [ "${l}" = gtcrs ]; then
-                        if [ "${HB_ARCHITECTURE}" = "sunos" ]; then
+                        if [ "${HB_PLATFORM}" = "sunos" ]; then
                             linker_options="$linker_options -lcurses"
                         else
                             linker_options="$linker_options -lncurses"
@@ -867,12 +867,12 @@ mk_hblibso()
                 ;;
         esac
     done
-    if [ "${HB_ARCHITECTURE}" = "darwin" ]; then
+    if [ "${HB_PLATFORM}" = "darwin" ]; then
         lib_ext=".dylib"
         lib_pref="lib"
         lib_suff=".${hb_ver}${lib_ext}"
-    elif [ "${HB_ARCHITECTURE}" = "win" ] || \
-         [ "${HB_ARCHITECTURE}" = "wce" ]; then
+    elif [ "${HB_PLATFORM}" = "win" ] || \
+         [ "${HB_PLATFORM}" = "wce" ]; then
         lib_ext=".dll"
         lib_pref=""
         if [ "${HB_COMPILER}" = "mingw64" ]; then
@@ -882,7 +882,7 @@ mk_hblibso()
         else
             lib_suff="-${hb_ver}${lib_ext}"
         fi
-    elif [ "${HB_ARCHITECTURE}" = "hpux" ]; then
+    elif [ "${HB_PLATFORM}" = "hpux" ]; then
         lib_ext=".sl"
         lib_pref="lib"
         lib_suff="-${hb_ver}${lib_ext}"
@@ -910,8 +910,8 @@ mk_hblibso()
         then
             ll=${l%${lib_suff}}${lib_ext}
             ln -sf $l $ll
-            if [ "${HB_ARCHITECTURE}" = "win" ] || \
-               [ "${HB_ARCHITECTURE}" = "wce" ]; then
+            if [ "${HB_PLATFORM}" = "win" ] || \
+               [ "${HB_PLATFORM}" = "wce" ]; then
                 if [ "${HB_XBUILD}" = "" ]; then
                    (cd "$dir"
                    mv "${HB_LIB_INSTALL}/$l" "${HB_BIN_INSTALL}"
diff --git a/harbour/bin/hb-mkdyn.sh b/harbour/bin/hb-mkdyn.sh
index 7d0210f1f2..4fa7ef6ca5 100755
--- a/harbour/bin/hb-mkdyn.sh
+++ b/harbour/bin/hb-mkdyn.sh
@@ -12,26 +12,26 @@
 # See COPYING for licensing terms.
 # ---------------------------------------------------------------
 
-# HB_ARCHITECTURE=""
+# HB_PLATFORM=""
 # HB_CCPREFIX=""
 
-if [ -n "${HB_ARCHITECTURE}" ]
+if [ -n "${HB_PLATFORM}" ]
 then
-    hb_arch="${HB_ARCHITECTURE}"
+    hb_plat="${HB_PLATFORM}"
 else
-    hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null`
+    hb_plat=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null`
 fi
 
 linker_options=""
 
-case "$hb_arch" in
-    *windows*|*mingw32*|msys*|cygwin*) hb_arch="win" ;;
-    *os/2*)                            hb_arch="os2" ;;
-    *dos)                              hb_arch="dos" ;;
-    *bsd)                              hb_arch="bsd" ;;
+case "$hb_plat" in
+    *windows*|*mingw32*|msys*|cygwin*) hb_plat="win" ;;
+    *os/2*)                            hb_plat="os2" ;;
+    *dos)                              hb_plat="dos" ;;
+    *bsd)                              hb_plat="bsd" ;;
 esac
 
-case "$hb_arch" in
+case "$hb_plat" in
     darwin) SLIB_EXT=".dylib" ;;
     win)    SLIB_EXT=".dll" ;;
     wce)    SLIB_EXT=".dll" ;;
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index da5de7b72b..a5d517f0fa 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -36,7 +36,7 @@ echo libpaths=../contrib/rddsql/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
 echo libpaths=../addons/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
 echo libpaths=../examples/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
 
-goto INST_%HB_ARCHITECTURE%
+goto INST_%HB_PLATFORM%
 
 :INST_WIN
 :INST_WCE
@@ -115,7 +115,7 @@ goto INST_%HB_ARCHITECTURE%
    "%HB_DIR_ZIP%zip.exe" -q -9 -X -r -o "%HB_TOP%\%HB_PKGNAME%.zip" . -i "%HB_PKGNAME%\*" -x *.tds -x *.exp
    popd
 
-   if "%HB_ARCHITECTURE%" == "dos" goto :EOF
+   if "%HB_PLATFORM%" == "dos" goto :EOF
 
    echo ! Making Harbour .exe install package: '%HB_TOP%\%HB_PKGNAME%.exe'
    "%HB_DIR_NSIS%makensis.exe" /V2 "%~dp0..\package\mpkg_win.nsi"
diff --git a/harbour/bin/postinst.cmd b/harbour/bin/postinst.cmd
index 13fdab2b71..a316c88bee 100644
--- a/harbour/bin/postinst.cmd
+++ b/harbour/bin/postinst.cmd
@@ -31,7 +31,7 @@ if not "%HB_INSTALL_PREFIX%" == "" xcopy /y ERRATA     %HB_INSTALL_PREFIX%\ > nu
 if not "%HB_INSTALL_PREFIX%" == "" xcopy /y INSTALL    %HB_INSTALL_PREFIX%\ > nul
 if not "%HB_INSTALL_PREFIX%" == "" xcopy /y TODO       %HB_INSTALL_PREFIX%\ > nul
 
-goto INST_%HB_ARCHITECTURE%
+goto INST_%HB_PLATFORM%
 
 :INST_OS2
 
diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh
index d44f6727ef..d310e4d37b 100755
--- a/harbour/bin/postinst.sh
+++ b/harbour/bin/postinst.sh
@@ -12,13 +12,13 @@
 # See COPYING for licensing terms.
 # ---------------------------------------------------------------
 
-if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ] || \
+if [ -z "$HB_PLATFORM" ] || [ -z "$HB_COMPILER" ] || \
    [ -z "$HB_BIN_INSTALL" ] || \
    [ -z "$HB_INC_INSTALL" ] || \
    [ -z "$HB_LIB_INSTALL" ]
 then
     echo "The following envvars must be set:"
-    echo "   HB_ARCHITECTURE"
+    echo "   HB_PLATFORM"
     echo "   HB_COMPILER"
     echo "   HB_BIN_INSTALL"
     echo "   HB_INC_INSTALL"
@@ -52,7 +52,7 @@ then
     if [ -n "${HB_TOOLS_PREF}" ]; then
         hb_mkdyn="${HB_BIN_INSTALL}/${HB_TOOLS_PREF}-mkdyn"
         rm -f "${hb_mkdyn}"
-        sed -e "s/^# HB_ARCHITECTURE=\"\"\$/HB_ARCHITECTURE=\"${HB_ARCHITECTURE}\"/g" \
+        sed -e "s/^# HB_PLATFORM=\"\"\$/HB_PLATFORM=\"${HB_PLATFORM}\"/g" \
             -e "s/^# HB_CCPREFIX=\"\"\$/[ -n \"\${HB_CCPREFIX}\" ] || HB_CCPREFIX=\"${HB_CCPREFIX}\"/g" \
             "${hb_root}/bin/hb-mkdyn.sh" > "${hb_mkdyn}" && \
         chmod 755 "${hb_mkdyn}"
@@ -64,7 +64,7 @@ then
     elif [ "$HB_COMPILER" = "sunpro" ]; then
         hb_mkdyn="${HB_BIN_INSTALL}/hb-mkdyn"
         rm -f "${hb_mkdyn}"
-        if [ "$HB_ARCHITECTURE" = "sunos" ] && \
+        if [ "$HB_PLATFORM" = "sunos" ] && \
            (isalist|grep sparc) &>/dev/null; then
             lnopt="-xcode=pic32"
         else
@@ -74,14 +74,14 @@ then
         sed -e "s/gcc -shared -fPIC/suncc -G ${lnopt} ${HB_ISAOPT}/g" \
             "${hb_root}/bin/hb-mkdyn.sh" > "${hb_mkdyn}" && \
         chmod 755 "${hb_mkdyn}"
-    elif [ "${HB_ARCHITECTURE}" = "sunos" ] || \
-         [ "${HB_ARCHITECTURE}" = "hpux" ] || \
+    elif [ "${HB_PLATFORM}" = "sunos" ] || \
+         [ "${HB_PLATFORM}" = "hpux" ] || \
          ! which install &>/dev/null; then
         hb_mkdyn="${HB_BIN_INSTALL}/hb-mkdyn"
         rm -f "${hb_mkdyn}"
         cp "${hb_root}/bin/hb-mkdyn.sh" "${hb_mkdyn}" && \
         chmod 755 "${hb_mkdyn}"
-    elif [ "${HB_ARCHITECTURE}" != "dos" ]; then
+    elif [ "${HB_PLATFORM}" != "dos" ]; then
         hb_mkdyn="${HB_BIN_INSTALL}/hb-mkdyn"
         # Without -c some OSes _move_ the file instead of copying it!
         install -c -m 755 "${hb_root}/bin/hb-mkdyn.sh" "${hb_mkdyn}"
@@ -96,7 +96,7 @@ then
 
     mk_hbtools "${HB_BIN_INSTALL}" "$@"
 
-    if [ "${HB_ARCHITECTURE}" != "dos" ]; then
+    if [ "${HB_PLATFORM}" != "dos" ]; then
         mk_hblibso "${hb_root}"
     fi
 fi
diff --git a/harbour/config/bin.mk b/harbour/config/bin.mk
index 939ac47ccb..96509198bc 100644
--- a/harbour/config/bin.mk
+++ b/harbour/config/bin.mk
@@ -4,7 +4,7 @@
 
 include $(TOP)$(ROOT)config/global.mk
 
-ifneq ($(HB_ARCHITECTURE),)
+ifneq ($(HB_PLATFORM),)
 ifneq ($(HB_COMPILER),)
 
 # Assemble template lib list to help create a few common variations
@@ -52,7 +52,7 @@ HB_LIBS_TPL :=
 _HB_RDD :=
 _HB_VM :=
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk
 include $(TOP)$(ROOT)config/c.mk
 include $(TOP)$(ROOT)config/prg.mk
 
diff --git a/harbour/config/common/watcom.mk b/harbour/config/common/watcom.mk
index dad994cdd5..daba5e3d2a 100644
--- a/harbour/config/common/watcom.mk
+++ b/harbour/config/common/watcom.mk
@@ -14,7 +14,7 @@
 
 # NOTE: Hack to force no extension for Linux binaries created on non-Linux hosts.
 #       Otherwise they become '.elf'. [vszakats]
-ifeq ($(HB_ARCHITECTURE),linux)
+ifeq ($(HB_PLATFORM),linux)
    ifneq ($(HB_HOST_PLAT),linux)
       BIN_EXT := .
    endif
diff --git a/harbour/config/dir.mk b/harbour/config/dir.mk
index c138baee6d..bc9d8ad9f1 100644
--- a/harbour/config/dir.mk
+++ b/harbour/config/dir.mk
@@ -4,7 +4,7 @@
 
 include $(TOP)$(ROOT)config/global.mk
 
-ifneq ($(HB_ARCHITECTURE),)
+ifneq ($(HB_PLATFORM),)
 ifneq ($(HB_COMPILER),)
 
 ifeq ($(HB_HOST_PLAT),dos)
diff --git a/harbour/config/doc.mk b/harbour/config/doc.mk
index 427f674e46..c6f1f8394c 100644
--- a/harbour/config/doc.mk
+++ b/harbour/config/doc.mk
@@ -4,7 +4,7 @@
 
 include $(TOP)$(ROOT)config/global.mk
 
-ifneq ($(HB_ARCHITECTURE),)
+ifneq ($(HB_PLATFORM),)
 ifneq ($(HB_COMPILER),)
 
 first::
diff --git a/harbour/config/dyn.mk b/harbour/config/dyn.mk
index efa37cfcec..4879ad4b91 100644
--- a/harbour/config/dyn.mk
+++ b/harbour/config/dyn.mk
@@ -4,10 +4,10 @@
 
 include $(TOP)$(ROOT)config/global.mk
 
-ifneq ($(HB_ARCHITECTURE),)
+ifneq ($(HB_PLATFORM),)
 ifneq ($(HB_COMPILER),)
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk
 include $(TOP)$(ROOT)config/c.mk
 include $(TOP)$(ROOT)config/prg.mk
 
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 4f55eca24d..be93719a03 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -200,6 +200,11 @@ ifneq ($(HB_BUILD_NAME),)
    endif
 endif
 
+# Compatibility
+#ifeq ($(HB_PLATFORM),)
+#   HB_PLATFORM := $(HB_ARCHITECTURE)
+#endif
+
 ifeq ($(HB_INIT_DONE),)
    # Store the original value
    export HB_MAKECMDGOALS := $(MAKECMDGOALS)
@@ -250,7 +255,7 @@ ifeq ($(HB_INIT_DONE),)
       #   HB_NCURSES_194              -> HB_USER_CFLAGS=-DHB_NCURSES_194
       #   HB_DLLIBS                   -> ?
       # Macros:
-      #   -DHB_PCRE_REGEX, -DHB_POSIX_REGEX, -DHB_EXT_ZLIB, -DHB_HAS_GPM
+      #   -DHB_PCRE_REGEX, -DHB_POSIX_REGEX, -DHB_EXT_ZLIB, -DHB_HAS_GPM, -DHB_GT_LIB=
 
       $(info ! MAKE: $(MAKE) $(MAKE_VERSION) $(HB_MAKECMDGOALS) $(MAKEFLAGS) $(SHELL) $(if $(MAKESHELL), MAKESHELL: $(MAKESHELL),))
       ifneq ($(HB_USER_PRGFLAGS),)
@@ -415,8 +420,8 @@ ifeq ($(HB_HOST_PLAT),)
             ifeq ($(HB_SHELL),dos)
                HB_HOST_PLAT := dos
             else
-               ifneq ($(HB_ARCHITECTURE),)
-                  HB_HOST_PLAT := $(HB_ARCHITECTURE)
+               ifneq ($(HB_PLATFORM),)
+                  HB_HOST_PLAT := $(HB_PLATFORM)
                endif
             endif
          endif
@@ -478,40 +483,40 @@ ifeq ($(HB_INIT_DONE),)
 endif
 
 HB_PLAT_AUTO :=
-ifeq ($(HB_ARCHITECTURE),)
-   HB_ARCHITECTURE := $(HB_HOST_PLAT)
+ifeq ($(HB_PLATFORM),)
+   HB_PLATFORM := $(HB_HOST_PLAT)
    ifneq ($(HB_COMPILER),)
       ifeq ($(HB_COMPILER),msvcarm)
-         HB_ARCHITECTURE := wce
+         HB_PLATFORM := wce
       else
          ifeq ($(HB_COMPILER),mingwarm)
-            HB_ARCHITECTURE := wce
+            HB_PLATFORM := wce
          else
             ifeq ($(HB_COMPILER),poccarm)
-               HB_ARCHITECTURE := wce
+               HB_PLATFORM := wce
             else
                ifeq ($(HB_COMPILER),djgpp)
-                  HB_ARCHITECTURE := dos
+                  HB_PLATFORM := dos
                else
                   ifneq ($(filter $(HB_COMPILER),mingw mingw64 msvc msvc64 msvcia64 bcc xcc pocc pocc64),)
-                     HB_ARCHITECTURE := win
+                     HB_PLATFORM := win
                   endif
                endif
             endif
          endif
       endif
    endif
-   ifneq ($(HB_ARCHITECTURE),)
+   ifneq ($(HB_PLATFORM),)
       HB_PLAT_AUTO := (autodetected)
    endif
 endif
 
 HB_COMP_AUTO :=
 ifeq ($(HB_COMPILER),)
-   ifneq ($(HB_HOST_PLAT),$(HB_ARCHITECTURE))
+   ifneq ($(HB_HOST_PLAT),$(HB_PLATFORM))
       # cross-build section *nix -> win/wce
       ifeq ($(filter $(HB_HOST_PLAT),dos os2),)
-         ifeq ($(HB_ARCHITECTURE),win)
+         ifeq ($(HB_PLATFORM),win)
 
             ifeq ($(call find_in_path_par,$(HB_CCPREFIX),$(HB_CCPATH)),)
                HB_CCPREFIX :=
@@ -531,7 +536,7 @@ ifeq ($(HB_COMPILER),)
                         HB_CCPREFIX := i686-mingw32-
                      endif
                   else
-                     ifeq ($(HB_ARCHITECTURE),bsd)
+                     ifeq ($(HB_PLATFORM),bsd)
                         HB_CCPATH := /usr/local/mingw32
                      else
                         MINGW_OK := $(strip $(foreach d, i386-mingw i486-mingw i586-mingw i686-mingw i386-mingw32 i486-mingw32 i586-mingw32 i686-mingw32, $(if $(wildcard /usr/local/bin/$(d)-gcc),$(d),)))
@@ -562,7 +567,7 @@ ifeq ($(HB_COMPILER),)
 
             ifneq ($(HB_CCPATH)$(HB_CCPREFIX),)
                HB_COMPILER := mingw
-               HB_ARCHITECTURE := win
+               HB_PLATFORM := win
                export HB_TOOLS_PREF := hbw
                export HB_XBUILD := win
                ifneq ($(HB_HOST_BUILD),all)
@@ -572,7 +577,7 @@ ifeq ($(HB_COMPILER),)
                $(error ! Harbour build couldn't find mingw32 cross-compiler. Please install it, or point HB_CCPATH/HB_CCPREFIX environment variables to it)
             endif
          else
-            ifeq ($(HB_ARCHITECTURE),wce)
+            ifeq ($(HB_PLATFORM),wce)
 
                # Look for known mingw32ce compilers on HB_CCPATH if it's set
                ifneq ($(HB_CCPATH),)
@@ -623,7 +628,7 @@ ifeq ($(HB_COMPILER),)
                endif
 
                ifneq ($(HB_CCPATH)$(HB_CCPREFIX),)
-                  HB_ARCHITECTURE := wce
+                  HB_PLATFORM := wce
                   export HB_TOOLS_PREF := hbce
                   export HB_XBUILD := wce
                   ifneq ($(HB_HOST_BUILD),all)
@@ -637,20 +642,20 @@ ifeq ($(HB_COMPILER),)
       endif
    endif
    ifeq ($(HB_COMPILER),)
-      ifeq ($(HB_ARCHITECTURE),win)
+      ifeq ($(HB_PLATFORM),win)
          ifneq ($(call find_in_path,arm-wince-mingw32ce-gcc),)
             HB_COMPILER := mingwarm
-            HB_ARCHITECTURE := wce
+            HB_PLATFORM := wce
             HB_CCPREFIX := arm-wince-mingw32ce-
          else
             ifneq ($(call find_in_path,arm-mingw32ce-gcc),)
                HB_COMPILER := mingwarm
-               HB_ARCHITECTURE := wce
+               HB_PLATFORM := wce
                HB_CCPREFIX := arm-mingw32ce-
             else
                ifneq ($(call find_in_path,i386-mingw32ce-gcc),)
                   HB_COMPILER := mingw
-                  HB_ARCHITECTURE := wce
+                  HB_PLATFORM := wce
                   HB_CCPREFIX := i386-mingw32ce-
                else
                   ifneq ($(call find_in_path,cygstart),)
@@ -664,12 +669,12 @@ ifeq ($(HB_COMPILER),)
                         else
                            ifneq ($(call find_in_path,clarm),)
                               HB_COMPILER := msvcarm
-                              HB_ARCHITECTURE := wce
+                              HB_PLATFORM := wce
                               export HB_VISUALC_VER_PRE80 := yes
                            else
                               ifneq ($(call find_in_path,armasm),)
                                  HB_COMPILER := msvcarm
-                                 HB_ARCHITECTURE := wce
+                                 HB_PLATFORM := wce
                               else
                                  ifneq ($(call find_in_path,ml64),)
                                     HB_COMPILER := msvc64
@@ -708,7 +713,7 @@ ifeq ($(HB_COMPILER),)
             endif
          endif
       else
-         ifeq ($(HB_ARCHITECTURE),linux)
+         ifeq ($(HB_PLATFORM),linux)
             ifneq ($(call find_in_path,wpp386),)
                HB_COMPILER := watcom
             else
@@ -717,12 +722,12 @@ ifeq ($(HB_COMPILER),)
                endif
             endif
          else
-            ifneq ($(filter $(HB_ARCHITECTURE),darwin hpux bsd),)
+            ifneq ($(filter $(HB_PLATFORM),darwin hpux bsd),)
                ifneq ($(call find_in_path,gcc),)
                   HB_COMPILER := gcc
                endif
             else
-               ifeq ($(HB_ARCHITECTURE),sunos)
+               ifeq ($(HB_PLATFORM),sunos)
                   ifneq ($(call find_in_path,suncc),)
                      HB_COMPILER := sunpro
                   else
@@ -731,7 +736,7 @@ ifeq ($(HB_COMPILER),)
                      endif
                   endif
                else
-                  ifeq ($(HB_ARCHITECTURE),dos)
+                  ifeq ($(HB_PLATFORM),dos)
                      ifneq ($(call find_in_path,gcc),)
                         HB_COMPILER := djgpp
                      else
@@ -740,7 +745,7 @@ ifeq ($(HB_COMPILER),)
                         endif
                      endif
                   else
-                     ifeq ($(HB_ARCHITECTURE),os2)
+                     ifeq ($(HB_PLATFORM),os2)
                         ifneq ($(call find_in_path,gcc),)
                            HB_COMPILER := gcc
                         else
@@ -764,27 +769,27 @@ ifeq ($(HB_COMPILER),)
    export HB_CCPREFIX
 endif
 
-ifeq ($(HB_ARCHITECTURE),)
+ifeq ($(HB_PLATFORM),)
    $(error ! HB_ARCHICTECTURE not set, couldn't autodetect)
 endif
 ifeq ($(HB_COMPILER),)
    $(error ! HB_COMPILER not set, couldn't autodetect)
 endif
 
-export HB_ARCHITECTURE
+export HB_PLATFORM
 export HB_COMPILER
 
-ifneq ($(filter $(HB_ARCHITECTURE),win wce dos os2),)
+ifneq ($(filter $(HB_PLATFORM),win wce dos os2),)
    HB_OS_UNIX := no
 else
    HB_OS_UNIX := yes
 endif
 
-ARCH_COMP := $(HB_ARCHITECTURE)/$(HB_COMPILER)$(subst \,/,$(HB_BUILD_NAME))
+PLAT_COMP := $(HB_PLATFORM)/$(HB_COMPILER)$(subst \,/,$(HB_BUILD_NAME))
 
-OBJ_DIR := obj/$(ARCH_COMP)
-BIN_DIR := $(TOP)$(ROOT)bin/$(ARCH_COMP)
-LIB_DIR := $(TOP)$(ROOT)lib/$(ARCH_COMP)
+OBJ_DIR := obj/$(PLAT_COMP)
+BIN_DIR := $(TOP)$(ROOT)bin/$(PLAT_COMP)
+LIB_DIR := $(TOP)$(ROOT)lib/$(PLAT_COMP)
 ifeq ($(HB_OS_UNIX),no)
    DYN_DIR := $(BIN_DIR)
    IMP_DIR := $(LIB_DIR)
@@ -795,7 +800,7 @@ endif
 DYN_PREF :=
 # define PKG_DIR only if run from root Makefile
 ifeq ($(ROOT),./)
-   PKG_DIR := $(TOP)$(ROOT)pkg/$(ARCH_COMP)
+   PKG_DIR := $(TOP)$(ROOT)pkg/$(PLAT_COMP)
 else
    PKG_DIR :=
 endif
@@ -806,7 +811,7 @@ GRANDP := $(subst $(subst x,x, ),,$(foreach item, $(subst /, ,$(OBJ_DIR)), ../))
 
 # TODO: Set this in <arch>/<comp>.mk
 HB_CPU :=
-ifeq ($(HB_ARCHITECTURE),win)
+ifeq ($(HB_PLATFORM),win)
    ifneq ($(filter $(HB_COMPILER),msvc64 mingw64 pocc64),)
       HB_CPU := x86_64
    else
@@ -817,7 +822,7 @@ ifeq ($(HB_ARCHITECTURE),win)
       endif
    endif
 else
-   ifeq ($(HB_ARCHITECTURE),wce)
+   ifeq ($(HB_PLATFORM),wce)
       ifneq ($(filter $(HB_COMPILER),msvcarm mingwarm poccarm),)
          HB_CPU := arm
       else
@@ -832,7 +837,7 @@ else
          endif
       endif
    else
-      ifneq ($(filter $(HB_ARCHITECTURE),dos os2),)
+      ifneq ($(filter $(HB_PLATFORM),dos os2),)
          HB_CPU := x86
       endif
    endif
@@ -840,7 +845,7 @@ endif
 
 ifeq ($(HB_INIT_DONE),)
    ifneq ($(MAKE_381),)
-      $(info ! HB_ARCHITECTURE: $(HB_ARCHITECTURE)$(if $(HB_CPU), ($(HB_CPU)),) $(HB_PLAT_AUTO))
+      $(info ! HB_PLATFORM: $(HB_PLATFORM)$(if $(HB_CPU), ($(HB_CPU)),) $(HB_PLAT_AUTO))
       $(info ! HB_COMPILER: $(HB_COMPILER) $(HB_COMP_AUTO))
    endif
 endif
@@ -855,11 +860,11 @@ HB_CFLAGS :=
 HB_PRGFLAGS :=
 
 HB_CROSS_BUILD :=
-ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_ARCHITECTURE)$(HB_CPU))
+ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_PLATFORM)$(HB_CPU))
    ifeq ($(HB_BIN_COMPILE),)
       # Not required in these combinations: [vszakats]
-      ifneq ($(HB_HOST_PLAT)-$(HB_HOST_CPU)-$(HB_ARCHITECTURE)-$(HB_CPU),win-x86_64-win-x86)
-         ifneq ($(HB_HOST_PLAT)-$(HB_HOST_CPU)-$(HB_ARCHITECTURE)-$(HB_CPU),win-x86-dos-)
+      ifneq ($(HB_HOST_PLAT)-$(HB_HOST_CPU)-$(HB_PLATFORM)-$(HB_CPU),win-x86_64-win-x86)
+         ifneq ($(HB_HOST_PLAT)-$(HB_HOST_CPU)-$(HB_PLATFORM)-$(HB_CPU),win-x86-dos-)
             HB_CROSS_BUILD := yes
             # Try to autosetup
             HB_BIN_COMPILE := $(dir $(firstword $(wildcard $(TOP)$(ROOT)bin/$(HB_HOST_PLAT)/*/harbour$(HB_HOST_BIN_EXT))))
@@ -903,7 +908,7 @@ ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_ARCHITECTURE)$(HB_CPU))
             endif
          endif
       endif
-      ifeq ($(HB_ARCHITECTURE),win)
+      ifeq ($(HB_PLATFORM),win)
          HB_PRGFLAGS += -D__PLATFORM__WINDOWS
          ifeq ($(HB_CPU),x86_64)
             HB_PRGFLAGS += -D__ARCH64BIT__
@@ -913,16 +918,16 @@ ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_ARCHITECTURE)$(HB_CPU))
             endif
          endif
       else
-         ifeq ($(HB_ARCHITECTURE),wce)
+         ifeq ($(HB_PLATFORM),wce)
             HB_PRGFLAGS += -D__PLATFORM__WINDOWS -D__PLATFORM__WINCE
          else
-            ifeq ($(HB_ARCHITECTURE),dos)
+            ifeq ($(HB_PLATFORM),dos)
                HB_PRGFLAGS += -D__PLATFORM__DOS
             else
-               ifeq ($(HB_ARCHITECTURE),os2)
+               ifeq ($(HB_PLATFORM),os2)
                   HB_PRGFLAGS += -D__PLATFORM__OS2
                else
-                  ifeq ($(HB_ARCHITECTURE),linux)
+                  ifeq ($(HB_PLATFORM),linux)
                      HB_PRGFLAGS += -D__PLATFORM__LINUX -D__PLATFORM__UNIX
                   endif
                endif
@@ -941,7 +946,7 @@ endif
 # Detect OpenSSL lib
 ifeq ($(HB_HAS_OPENSSL),)
    HB_HAS_OPENSSL := no
-   ifneq ($(HB_ARCHITECTURE),dos)
+   ifneq ($(HB_PLATFORM),dos)
       ifneq ($(HB_COMPILER),watcom)
          ifeq ($(HB_INC_OPENSSL),)
             ifeq ($(HB_XBUILD),)
@@ -1011,7 +1016,7 @@ endif
 
 ifneq ($(HB_HOST_PLAT),dos)
    HB_VERSION := $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(HB_VER_STATUS)
-   HB_PKGNAME := harbour-$(HB_VERSION)-$(HB_ARCHITECTURE)-$(HB_COMPILER)
+   HB_PKGNAME := harbour-$(HB_VERSION)-$(HB_PLATFORM)-$(HB_COMPILER)
    HB_PKGNAMI := $(HB_PKGNAME)
 else
    # Use short names in MS-DOS
@@ -1061,8 +1066,8 @@ else
                # Stick to *nix customs. I don't like it, it needs admin.
                HB_INSTALL_PREFIX := /usr/local
                # Add postfix for cross builds
-               ifneq ($(HB_HOST_PLAT),$(HB_ARCHITECTURE))
-                  HB_INSTALL_PREFIX += /harbour-$(HB_ARCHITECTURE)-$(HB_COMPILER)
+               ifneq ($(HB_HOST_PLAT),$(HB_PLATFORM))
+                  HB_INSTALL_PREFIX += /harbour-$(HB_PLATFORM)-$(HB_COMPILER)
                endif
             endif
          endif
@@ -1074,10 +1079,10 @@ else
       #        recursive operation here.
 
       # Handle simple macros in value
-      HB_INSTALL_PREFIX := $(subst {HB_ARCH},$(HB_ARCHITECTURE),$(HB_INSTALL_PREFIX))
-      HB_INSTALL_PREFIX := $(subst {HB_COMP},$(HB_COMPILER),$(HB_INSTALL_PREFIX))
-      HB_INSTALL_PREFIX := $(subst {HB_CPU},$(HB_CPU),$(HB_INSTALL_PREFIX))
-      HB_INSTALL_PREFIX := $(subst {HB_TOP},$(realpath $(TOP)$(ROOT)),$(HB_INSTALL_PREFIX))
+      HB_INSTALL_PREFIX := $(subst {hb_plat},$(HB_PLATFORM),$(HB_INSTALL_PREFIX))
+      HB_INSTALL_PREFIX := $(subst {hb_comp},$(HB_COMPILER),$(HB_INSTALL_PREFIX))
+      HB_INSTALL_PREFIX := $(subst {hb_cpu},$(HB_CPU),$(HB_INSTALL_PREFIX))
+      HB_INSTALL_PREFIX := $(subst {hb_top},$(realpath $(TOP)$(ROOT)),$(HB_INSTALL_PREFIX))
       HB_INSTALL_PREFIX := $(subst /,$(DIRSEP),$(HB_INSTALL_PREFIX))
    endif
 endif
@@ -1093,7 +1098,7 @@ endif
 ifneq ($(HB_INSTALL_PREFIX),)
 
    ifeq ($(HB_OS_UNIX),no)
-      LIBPOSTFIX := $(DIRSEP)$(subst /,$(DIRSEP),$(ARCH_COMP))
+      LIBPOSTFIX := $(DIRSEP)$(subst /,$(DIRSEP),$(PLAT_COMP))
    else
       # Not perfect, please enhance it.
       ifneq ($(findstring |/usr,|$(HB_INSTALL_PREFIX)),)
@@ -1173,7 +1178,7 @@ endif
 
 export HB_INIT_DONE := yes
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/global.mk
 include $(TOP)$(ROOT)config/globsh.mk
 
 endif
diff --git a/harbour/config/header.mk b/harbour/config/header.mk
index 98d16a7ab8..e258629a7e 100644
--- a/harbour/config/header.mk
+++ b/harbour/config/header.mk
@@ -4,7 +4,7 @@
 
 include $(TOP)$(ROOT)config/global.mk
 
-ifneq ($(HB_ARCHITECTURE),)
+ifneq ($(HB_PLATFORM),)
 ifneq ($(HB_COMPILER),)
 
 first::
diff --git a/harbour/config/lib.mk b/harbour/config/lib.mk
index 98dc728cc2..e750b5794c 100644
--- a/harbour/config/lib.mk
+++ b/harbour/config/lib.mk
@@ -4,7 +4,7 @@
 
 include $(TOP)$(ROOT)config/global.mk
 
-ifneq ($(HB_ARCHITECTURE),)
+ifneq ($(HB_PLATFORM),)
 ifneq ($(HB_COMPILER),)
 
 HB_DYN_LIBS := \
@@ -37,7 +37,7 @@ HB_DYN_LIBS := \
    hbvmmt \
    hbmaindllh
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk
 include $(TOP)$(ROOT)config/c.mk
 include $(TOP)$(ROOT)config/prg.mk
 
diff --git a/harbour/config/none.mk b/harbour/config/none.mk
index 80476b614d..48d00e7f56 100644
--- a/harbour/config/none.mk
+++ b/harbour/config/none.mk
@@ -4,7 +4,7 @@
 
 include $(TOP)$(ROOT)config/global.mk
 
-ifneq ($(HB_ARCHITECTURE),)
+ifneq ($(HB_PLATFORM),)
 ifneq ($(HB_COMPILER),)
 
 ifneq ($(LIBNAME),)
diff --git a/harbour/config/wce/mingw.mk b/harbour/config/wce/mingw.mk
index 81f5fec9d5..d56ecf2b85 100644
--- a/harbour/config/wce/mingw.mk
+++ b/harbour/config/wce/mingw.mk
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/mingw.mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/mingw.mk
diff --git a/harbour/config/win/gcc.mk b/harbour/config/win/gcc.mk
index 81f5fec9d5..d56ecf2b85 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.mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/mingw.mk
diff --git a/harbour/config/win/iccia64.mk b/harbour/config/win/iccia64.mk
index 5c48ba228f..fe99fc80ed 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.mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/icc.mk
diff --git a/harbour/config/win/mingw64.mk b/harbour/config/win/mingw64.mk
index 81f5fec9d5..d56ecf2b85 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.mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/mingw.mk
diff --git a/harbour/config/win/msvc64.mk b/harbour/config/win/msvc64.mk
index 53f05a9eeb..0290ecdfa4 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.mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/msvc.mk
diff --git a/harbour/config/win/msvcia64.mk b/harbour/config/win/msvcia64.mk
index 53f05a9eeb..0290ecdfa4 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.mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/msvc.mk
diff --git a/harbour/config/win/pocc64.mk b/harbour/config/win/pocc64.mk
index 560c69dea8..ea147e4dc9 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.mk
+include $(TOP)$(ROOT)config/$(HB_PLATFORM)/pocc.mk
 
 CPPFLAGS += /Tamd64-coff
diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile
index 545f71f855..a5a4dc695f 100644
--- a/harbour/contrib/gtqtc/Makefile
+++ b/harbour/contrib/gtqtc/Makefile
@@ -10,10 +10,10 @@ LIBNAME := gtqtc
 
 ifeq ($(HB_WITH_QT),)
    HB_WITH_QT := yes
-   ifeq ($(HB_ARCHITECTURE),dos)
+   ifeq ($(HB_PLATFORM),dos)
       HB_WITH_QT := no
    endif
-   ifeq ($(HB_ARCHITECTURE),os2)
+   ifeq ($(HB_PLATFORM),os2)
       HB_WITH_QT := no
    endif
    ifeq ($(HB_COMPILER),mingw64)
@@ -45,7 +45,7 @@ ifeq ($(HB_INC_QT),)
 endif
 
 HB_INC_QT_OK := $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),))
-ifeq ($(HB_ARCHITECTURE),darwin)
+ifeq ($(HB_PLATFORM),darwin)
    ifeq ($(strip $(HB_INC_QT_OK)),)
       HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
       ifeq ($(HB_INC_QT_OK),spec)
diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile
index e1e87a14ca..c7289cfbdd 100644
--- a/harbour/contrib/gtwvg/Makefile
+++ b/harbour/contrib/gtwvg/Makefile
@@ -11,7 +11,7 @@ HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbwin
 LIBNAME := gtwvg
 
 ifeq ($(HB_WITH_GTWVG),)
-   ifeq ($(HB_ARCHITECTURE),win)
+   ifeq ($(HB_PLATFORM),win)
       ifeq ($(HB_COMPILER),mingw)
          HB_WITH_GTWVG := yes
       endif
diff --git a/harbour/contrib/hbblat/Makefile b/harbour/contrib/hbblat/Makefile
index fc6e8fadd8..ba143b7f2a 100644
--- a/harbour/contrib/hbblat/Makefile
+++ b/harbour/contrib/hbblat/Makefile
@@ -8,7 +8,7 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbblat
 
-ifeq ($(HB_ARCHITECTURE),win)
+ifeq ($(HB_PLATFORM),win)
 
 C_SOURCES := \
    blatwrp.c \
diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile
index 2aba129299..186de2eb0b 100644
--- a/harbour/contrib/hbcurl/Makefile
+++ b/harbour/contrib/hbcurl/Makefile
@@ -10,7 +10,7 @@ LIBNAME := hbcurl
 
 HB_INC_CURL_OK :=
 
-ifneq ($(HB_ARCHITECTURE),dos)
+ifneq ($(HB_PLATFORM),dos)
 
 ifeq ($(HB_INC_CURL),)
    ifeq ($(HB_XBUILD),)
@@ -41,10 +41,10 @@ install::
 	$(INSTALL_RULE_HEADERS)
 
 DIRS :=
-ifeq ($(HB_ARCHITECTURE),win)
+ifeq ($(HB_PLATFORM),win)
    DIRS += hbcurls
 endif
-ifeq ($(HB_ARCHITECTURE),wce)
+ifeq ($(HB_PLATFORM),wce)
    DIRS += hbcurls
 endif
 
diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile
index f689500a81..d1f8e7aab2 100644
--- a/harbour/contrib/hbfimage/Makefile
+++ b/harbour/contrib/hbfimage/Makefile
@@ -10,11 +10,11 @@ LIBNAME := hbfimage
 
 HB_INC_FREEIMAGE_OK :=
 
-ifneq ($(HB_ARCHITECTURE),dos)
+ifneq ($(HB_PLATFORM),dos)
 # disabled until a proper solution is found for type collision
-ifneq ($(HB_ARCHITECTURE),os2)
-ifneq ($(HB_ARCHITECTURE),linux)
-ifneq ($(HB_ARCHITECTURE),darwin)
+ifneq ($(HB_PLATFORM),os2)
+ifneq ($(HB_PLATFORM),linux)
+ifneq ($(HB_PLATFORM),darwin)
 
 ifeq ($(HB_INC_FREEIMAGE),)
    ifeq ($(HB_XBUILD),)
diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile
index fda443de51..549d079e01 100644
--- a/harbour/contrib/hbodbc/Makefile
+++ b/harbour/contrib/hbodbc/Makefile
@@ -11,15 +11,15 @@ LIBNAME := hbodbc
 ifeq ($(HB_COMPILER),rsxnt)
    HB_WITHOUT_ODBC := yes
 endif
-ifeq ($(HB_ARCHITECTURE),dos)
+ifeq ($(HB_PLATFORM),dos)
    HB_WITHOUT_ODBC := yes
 endif
-ifeq ($(HB_ARCHITECTURE),os2)
+ifeq ($(HB_PLATFORM),os2)
    HB_WITHOUT_ODBC := yes
 endif
 
-ifneq ($(HB_ARCHITECTURE),win)
-ifneq ($(HB_ARCHITECTURE),wce)
+ifneq ($(HB_PLATFORM),win)
+ifneq ($(HB_PLATFORM),wce)
 ifeq ($(HB_WITHOUT_ODBC),)
 
 ifeq ($(HB_INC_ODBC),)
diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile
index 754e65921a..6e70a1f475 100644
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -10,10 +10,10 @@ LIBNAME := hbqt
 
 ifeq ($(HB_WITH_QT),)
    HB_WITH_QT := yes
-   ifeq ($(HB_ARCHITECTURE),dos)
+   ifeq ($(HB_PLATFORM),dos)
       HB_WITH_QT := no
    endif
-   ifeq ($(HB_ARCHITECTURE),os2)
+   ifeq ($(HB_PLATFORM),os2)
       HB_WITH_QT := no
    endif
    ifeq ($(HB_COMPILER),mingw64)
@@ -45,7 +45,7 @@ ifeq ($(HB_INC_QT),)
 endif
 
 HB_INC_QT_OK := $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),))
-ifeq ($(HB_ARCHITECTURE),darwin)
+ifeq ($(HB_PLATFORM),darwin)
    ifeq ($(strip $(HB_INC_QT_OK)),)
       HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
       ifeq ($(HB_INC_QT_OK),spec)
diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile
index 8eeaa1dc53..b1732da405 100644
--- a/harbour/contrib/hbsqlit3/Makefile
+++ b/harbour/contrib/hbsqlit3/Makefile
@@ -11,16 +11,16 @@ LIBNAME := hbsqlit3
 ifeq ($(HB_INC_SQLITE3),)
    ifeq ($(HB_XBUILD),)
       HB_INC_SQLITE3 := /usr/include
-      ifeq ($(HB_ARCHITECTURE),win)
+      ifeq ($(HB_PLATFORM),win)
          HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
       endif
-      ifeq ($(HB_ARCHITECTURE),wce)
+      ifeq ($(HB_PLATFORM),wce)
          HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
       endif
-      ifeq ($(HB_ARCHITECTURE),os2)
+      ifeq ($(HB_PLATFORM),os2)
          HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
       endif
-      ifeq ($(HB_ARCHITECTURE),dos)
+      ifeq ($(HB_PLATFORM),dos)
          HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
       endif
    endif
diff --git a/harbour/contrib/hbssl/Makefile b/harbour/contrib/hbssl/Makefile
index b61376b6ca..12466b9305 100644
--- a/harbour/contrib/hbssl/Makefile
+++ b/harbour/contrib/hbssl/Makefile
@@ -11,7 +11,7 @@ LIBNAME := hbssl
 ifeq ($(HB_HAS_OPENSSL),yes)
 
 HB_CFLAGS += -I$(HB_INC_OPENSSL)
-ifeq ($(HB_ARCHITECTURE),darwin)
+ifeq ($(HB_PLATFORM),darwin)
    HB_CFLAGS += -DOPENSSL_NO_SHA256 -DOPENSSL_NO_SHA512 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_DGRAM -DHB_OPENSSL_OLD_OSX_
 endif
 
diff --git a/harbour/contrib/hbtip/Makefile b/harbour/contrib/hbtip/Makefile
index fa88b2a23c..07468d6040 100644
--- a/harbour/contrib/hbtip/Makefile
+++ b/harbour/contrib/hbtip/Makefile
@@ -8,7 +8,7 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbtip
 
-ifneq ($(HB_ARCHITECTURE),dos)
+ifneq ($(HB_PLATFORM),dos)
 
 C_SOURCES := \
    encmthd.c \
diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile
index 178d3dd684..10b2d46f47 100644
--- a/harbour/contrib/hbwin/Makefile
+++ b/harbour/contrib/hbwin/Makefile
@@ -9,10 +9,10 @@ include $(TOP)$(ROOT)config/global.mk
 LIBNAME := hbwin
 
 ifeq ($(HB_WITH_HBWIN),)
-   ifeq ($(HB_ARCHITECTURE),win)
+   ifeq ($(HB_PLATFORM),win)
       HB_WITH_HBWIN := yes
    endif
-   ifeq ($(HB_ARCHITECTURE),wce)
+   ifeq ($(HB_PLATFORM),wce)
       HB_WITH_HBWIN := yes
    endif
 endif
diff --git a/harbour/contrib/hbxbp/Makefile b/harbour/contrib/hbxbp/Makefile
index 48a98f1faf..f1ba108035 100644
--- a/harbour/contrib/hbxbp/Makefile
+++ b/harbour/contrib/hbxbp/Makefile
@@ -12,10 +12,10 @@ LIBNAME := hbxbp
 
 ifeq ($(HB_WITH_QT),)
    HB_WITH_QT := yes
-   ifeq ($(HB_ARCHITECTURE),dos)
+   ifeq ($(HB_PLATFORM),dos)
       HB_WITH_QT := no
    endif
-   ifeq ($(HB_ARCHITECTURE),os2)
+   ifeq ($(HB_PLATFORM),os2)
       HB_WITH_QT := no
    endif
    ifeq ($(HB_COMPILER),mingw64)
diff --git a/harbour/contrib/rddado/Makefile b/harbour/contrib/rddado/Makefile
index 0e525e8763..d0db7a0c2d 100644
--- a/harbour/contrib/rddado/Makefile
+++ b/harbour/contrib/rddado/Makefile
@@ -8,7 +8,7 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := rddado
 
-ifneq ($(HB_ARCHITECTURE),os2)
+ifneq ($(HB_PLATFORM),os2)
 
 PRG_SOURCES := \
    adordd.prg \
diff --git a/harbour/contrib/rddads/Makefile b/harbour/contrib/rddads/Makefile
index e49ffa4dbf..f796322fb3 100644
--- a/harbour/contrib/rddads/Makefile
+++ b/harbour/contrib/rddads/Makefile
@@ -8,8 +8,8 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := rddads
 
-ifneq ($(HB_ARCHITECTURE),dos)
-ifneq ($(HB_ARCHITECTURE),os2)
+ifneq ($(HB_PLATFORM),dos)
+ifneq ($(HB_PLATFORM),os2)
 
 ifeq ($(HB_INC_ADS),)
    HB_INC_ADS := /usr/local/ads/acesdk $(HOME)/ads/acesdk
diff --git a/harbour/contrib/rddsql/sddodbc/Makefile b/harbour/contrib/rddsql/sddodbc/Makefile
index 56836acff9..b8bf7cb8d7 100644
--- a/harbour/contrib/rddsql/sddodbc/Makefile
+++ b/harbour/contrib/rddsql/sddodbc/Makefile
@@ -11,15 +11,15 @@ LIBNAME := sddodbc
 ifeq ($(HB_COMPILER),rsxnt)
    HB_WITHOUT_ODBC := yes
 endif
-ifeq ($(HB_ARCHITECTURE),dos)
+ifeq ($(HB_PLATFORM),dos)
    HB_WITHOUT_ODBC := yes
 endif
-ifeq ($(HB_ARCHITECTURE),os2)
+ifeq ($(HB_PLATFORM),os2)
    HB_WITHOUT_ODBC := yes
 endif
 
-ifneq ($(HB_ARCHITECTURE),win)
-ifneq ($(HB_ARCHITECTURE),wce)
+ifneq ($(HB_PLATFORM),win)
+ifneq ($(HB_PLATFORM),wce)
 ifeq ($(HB_WITHOUT_ODBC),)
 
 ifeq ($(HB_INC_ODBC),)
diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt
index 7496ac7b21..fdbcfbe0df 100644
--- a/harbour/doc/gmake.txt
+++ b/harbour/doc/gmake.txt
@@ -31,14 +31,14 @@ of the VM library:
 # $Id$
 #
 
-ROOT = ../../
+ROOT := ../../
 
-C_SOURCES=\
+C_SOURCES := \
         dynsym.c \
         hvm.c \
         initsymb.c \
 
-LIB=vm
+LIB := vm
 
 include $(TOP)$(ROOT)config/lib.mk
 --  Cut here  ---------------------------------------
@@ -99,7 +99,7 @@ DIRS := \
         rdd \
         tools \
 
-include $(ROOT)config/dir.mk
+include $(TOP)$(ROOT)config/dir.mk
 --  Cut here  ---------------------------------------
 
 This Makefile is used to traverse the subdirectories hanging from the
@@ -126,10 +126,11 @@ files compiled with gcc). This has two advantages:
 USAGE
 =====
 
-To use the system, you need to install GNU-make 3.75 or later on your
+To use the system, you need to install GNU-make 3.81 or later on your
 system. To check this, type "make -v"; you should see
 
-  GNU Make version 3.75, by Richard Stallman and Roland McGrath.
+  GNU Make 3.81
+  Copyright (C) 2006  Free Software Foundation, Inc.
   ...
 
 Then, you must set a couple of environment variables that indicate
@@ -139,13 +140,13 @@ For gcc on Win95/WinNT with the Cygwin library:
   Notes: The CYGWIN environment variable must include "noglob" in order
          to avoid having Harbour or programs created with Harbour expand
          wildcard command line arguments (this is checked at run-time!)
-  HB_ARCHITECTURE   win
+  HB_PLATFORM       win
   HB_COMPILER       gcc
   HB_GT_LIB         gtwin
   CYGWIN            noglob
 
 For gcc on Win95/WinNT with the MinGW library:
-  HB_ARCHITECTURE   win
+  HB_PLATFORM       win
   HB_COMPILER       mingw
   HB_GT_LIB         gtwin
 
@@ -157,12 +158,12 @@ For MSVC on Win95/WinNT:
          not set to unix
 
          For best results, in your copy of make_gnu.bat, also set:
-  HB_ARCHITECTURE   win
+  HB_PLATFORM       win
   HB_COMPILER       msvc
   HB_GT_LIB         gtwin
 
 For GCC on BSD:
-  HB_ARCHITECTURE   bsd
+  HB_PLATFORM       bsd
   HB_COMPILER       gcc
   HB_GT_LIB         gtstd
   Notes:
@@ -178,7 +179,7 @@ For GCC on BSD:
         match the default value in config/bsd/gcc.mk
 
 For GCC on Linux:
-  HB_ARCHITECTURE   linux
+  HB_PLATFORM       linux
   HB_COMPILER       gcc
   HB_GT_LIB         gtstd
   Notes:
@@ -196,7 +197,7 @@ For GCC on Linux:
 For GCC on OS/2 for VIO mode:
   Note: You must point C_INCLUDE_PATH to the EMX include directory and
         you must also point LIBRARY_PATH to the EMX library directory.
-  HB_ARCHITECTURE   os2
+  HB_PLATFORM       os2
   HB_COMPILER       gcc
   HB_GT_LIB         gtos2
 
@@ -204,33 +205,33 @@ For GCC on OS/2 for PM mode:
   Note: Harbour does not get built in PM mode, but  Harbour programs do.
   Note: You must point C_INCLUDE_PATH to the EMX include directory and
         you must also point LIBRARY_PATH to the EMX library directory.
-  HB_ARCHITECTURE   os2
+  HB_PLATFORM       os2
   HB_COMPILER       gcc
   HB_GT_LIB         os2pm
 
 For IBM Visual Age C++ on OS/2 for PM mode:
   Note: Harbour does not get built in PM mode, but Harbour programs do.
   Note: You must create an empty unistd.h in the IBMCPP\INCLUDE directory.
-  HB_ARCHITECTURE   os2
+  HB_PLATFORM       os2
   HB_COMPILER       icc
   HB_GT_LIB         os2pm
 
 For Borland C++ 5.5
-  HB_ARCHITECTURE   win
+  HB_PLATFORM       win
   HB_COMPILER       bcc
   HB_GT_LIB         gtwin
 
 For Borland C++ 3.x
-  HB_ARCHITECTURE   dos
+  HB_PLATFORM       dos
   HB_GT_LIB         gtdos
 
 For DJGPP (GCC port for DOS)
-  HB_ARCHITECTURE   dos
+  HB_PLATFORM       dos
   HB_COMPILER       djgpp
   HB_GT_LIB         gtdos
 
 For Watcom C/C++ 10.x (default Makefile creates DOS4G extender executables)
-  HB_ARCHITECTURE   dos
+  HB_PLATFORM       dos
   HB_COMPILER       watcom
   HB_GT_LIB         gtdos
   Note: It is possible that you will have to increase the space reserved for
diff --git a/harbour/doc/linux1st.txt b/harbour/doc/linux1st.txt
index ab3b30ee8c..8cd23c6e20 100644
--- a/harbour/doc/linux1st.txt
+++ b/harbour/doc/linux1st.txt
@@ -11,51 +11,23 @@ Ubuntu/Debian distro
 Packages needed to cleanly build Harbour:
 (Tested with Ubuntu 7.04, 8.04, 9.04)
 
-For GTCRS terminal lib:
-sudo apt-get install libncurses-dev
-
-For GTSLN terminal lib:
-sudo apt-get install libslang2-dev
-
-For GTXWC terminal lib:
-sudo apt-get install libx11-dev
-
-For console mouse support in GTTRM, GTSLN and GTCRS:
-sudo apt-get install libgpmg1-dev
-
-For contrib/hbodbc lib:
-sudo apt-get install unixodbc-dev
-
-For contrib/hbcurl lib:
-sudo apt-get install libcurl4-openssl-dev
-or
-sudo apt-get install libcurl4-gnutls-dev
-
-For contrib/hbfbird lib:
-sudo apt-get install libfirebird2.0-dev
-or
-sudo apt-get install firebird2.1-dev
-
-For contrib/hbfimage lib:
-sudo apt-get install libfreeimage-dev
-
-For contrib/hbgd lib:
-sudo apt-get install libgd2-xpm-dev
-or
-sudo apt-get install libgd-xpm-dev
-
-For contrib/hbmysql lib:
-sudo apt-get install libmysqlclient15-dev
-
-For contrib/hbpgsql lib:
-sudo apt-get install libpq-dev
-
-For contrib/hbqt lib:
-sudo apt-get install libqt4-dev
-
-For examples/hbgf/hbgfgtk lib:
-sudo apt-get install libgtk2.0-dev
-sudo apt-get install libglib2.0-dev
+For GTCRS terminal lib:        sudo apt-get install libncurses-dev
+For GTSLN terminal lib:        sudo apt-get install libslang2-dev
+For GTXWC terminal lib:        sudo apt-get install libx11-dev
+For console mouse support:     sudo apt-get install libgpmg1-dev
+For contrib/hbodbc lib:        sudo apt-get install unixodbc-dev
+For contrib/hbcurl lib:        sudo apt-get install libcurl4-openssl-dev OR
+                               sudo apt-get install libcurl4-gnutls-dev
+For contrib/hbfbird lib:       sudo apt-get install libfirebird2.0-dev OR
+                               sudo apt-get install firebird2.1-dev
+For contrib/hbfimage lib:      sudo apt-get install libfreeimage-dev
+For contrib/hbgd lib:          sudo apt-get install libgd2-xpm-dev OR
+                               sudo apt-get install libgd-xpm-dev
+For contrib/hbmysql lib:       sudo apt-get install libmysqlclient15-dev
+For contrib/hbpgsql lib:       sudo apt-get install libpq-dev
+For contrib/hbqt lib:          sudo apt-get install libqt4-dev
+For examples/hbgf/hbgfgtk lib: sudo apt-get install libgtk2.0-dev AND
+                               sudo apt-get install libglib2.0-dev
 
 For contrib/rddads lib:
 Download and install 'Advantage Client Engine API for Linux' package
@@ -88,77 +60,3 @@ For contrib/libharu:
   from http://libharu.org/
 - libpng-devel
 - zlib-devel
-
-
-Notes by Scott Johnson <scomps at purplewire.org>
--------------------------------------------------
-
-Ok, I finally got something to run.  The code I compiled was standard
-Clipper 5.2 code pulled directly from a dos/win box and was working
-properly there.
-
-I'm compiling under Debian Sarge which for their own reasons are using
-the Alpha Build 44.0.  It was installed with the standard apt-get
-harbour.  I did this to pretty much ensure that the install wasn't
-tainted by any of my previous attempts at getting this to work.
-
-The first thing I checked was for the bld.sh.  it didn't exist so I did
-the cut/paste thing from this list (thank you) and set out on my
-adventure.
-
-First off, set your environment variables.  If you want to set this up
-for your shell to do it automagically go for it.  That's beyond what I
-want to cover here.
-
-export HB_ARCHITECTURE=linux
-export HB_BIN_INSTALL=/usr/bin
-export HB_LIB_INSTALL=/usr/lib/harbour
-export HB_INC_INSTALL=/usr/include/harbour
-export HB_COMPILER=gcc
-
-Since we created the bld.sh from scratch, I dropped it in the /usr/bin
-directory where the rest of the harbour binaries exist.
-
-chmod +x bld.sh
-
-Now I go to where my actual clipper/harbour source code is.
-
-The files I have are inv.prg, csrc.prg, cmenu.prg and citem.prg.  The
-dbf files are already created and exist in the same directory, but
-that's just me.  I pulled those over with the dos application.
-
-Next, I issued the following command
-
-bld.sh inv csrc cmenu citem
-
-This ran through it's gyrations, made the c source and attempted to link
-it.  Hey, this is great although it bombed out with an unresolved
-external to dbfdbt.  Ok, so that's a library.  I can do this
-
-I jumped into the bld.sh file and hunted down the gcc line.  It's quite
-a ways down into the file, but you'll need to find the one appropriate
-for your system (mind was right after the last check for GT_LIB where it
-leaves it as gtstd if you don't set something.
-
-On the gcc line, you'll see a section like "-L$HB_LIB_INSTALL -ldebug"
-and so on; add "-ldbfdbt" (without the quotes of course).  I added it
-right after -lrdd, but I don't know if that's important or not. Maybe
-somebody can correct me there.
-
-After I saved it, I went back and issued the same bld.sh command as I
-did above, and lo!  It just worked.
-
-./inv
-
-As a side note, gtstd is probably not going to be very helpful for you
-in linux if you have any SAY/GET's as screen positioning (especially if
-you use xterm) won't be handled correctly.  Same with gtpca.  Gtcrs
-seemed to work properly in my environment.
-
-I know this is pretty sparse as far as any kind of documentation is
-concerned, and I might be doing things I don't need to, and not doing
-things that make people cringe.  It's a start though and maybe some
-folks can clean it up a bit and add/remove things that are important.
-At least this worked on my particular Debian system.   Your mileage may
-vary and other distributions will probably have their own setups and
-issues.
diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt
index ac90ff1dca..df68ce30e5 100644
--- a/harbour/doc/whatsnew.txt
+++ b/harbour/doc/whatsnew.txt
@@ -25,7 +25,8 @@ General
   - L_USR               -> HB_USER_LDFLAGS
   - A_USR               -> HB_USER_AFLAGS
   - MK_USR              -> HB_USER_MAKEFLAGS
-  - HB_ARCHITECTURE=w32 -> HB_ARCHITECTURE=win
+  - HB_ARCHITECTURE     -> HB_PLATFORM
+  - HB_PLATFORM=w32     -> HB_PLATFORM=win
   - CCPATH              -> HB_CCPREFIX
   - CCPREFIX            -> HB_CCPATH
 - GNU-make system revised to give optimal support -j<n>
diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile
index 0f2f5105b2..2f1e40943d 100644
--- a/harbour/external/libhpdf/Makefile
+++ b/harbour/external/libhpdf/Makefile
@@ -14,7 +14,7 @@ LIBNAME := libhpdf
 
 ifeq ($(HB_WITH_LIBHPDF),)
    HB_WITH_LIBHPDF := yes
-   ifeq ($(HB_ARCHITECTURE)-$(HB_COMPILER),win-watcom)
+   ifeq ($(HB_PLATFORM)-$(HB_COMPILER),win-watcom)
       HB_WITH_LIBHPDF := no
    endif
    # NOTE: dos hosts can't build this lib due to long filename. [vszakats]
@@ -24,7 +24,7 @@ ifeq ($(HB_WITH_LIBHPDF),)
    ifeq ($(HB_COMPILER),pocc64)
       HB_WITH_LIBHPDF := no
    endif
-   ifeq ($(HB_ARCHITECTURE),wce)
+   ifeq ($(HB_PLATFORM),wce)
       HB_WITH_LIBHPDF := no
    endif
    ifeq ($(HB_COMPILER),mingwarm)
@@ -38,19 +38,19 @@ ifeq ($(HB_WITH_LIBHPDF),yes)
 ifeq ($(HB_INC_LIBPNG),)
    ifeq ($(HB_XBUILD),)
       HB_INC_LIBPNG = /usr/include
-      ifeq ($(HB_ARCHITECTURE),win)
+      ifeq ($(HB_PLATFORM),win)
          HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
       endif
-      ifeq ($(HB_ARCHITECTURE),wce)
+      ifeq ($(HB_PLATFORM),wce)
          HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
       endif
-      ifeq ($(HB_ARCHITECTURE),os2)
+      ifeq ($(HB_PLATFORM),os2)
          HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
       endif
-      ifeq ($(HB_ARCHITECTURE),dos)
+      ifeq ($(HB_PLATFORM),dos)
          HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
       endif
-      ifeq ($(HB_ARCHITECTURE),darwin)
+      ifeq ($(HB_PLATFORM),darwin)
          HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
       endif
    endif
diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile
index 396f8e24d8..09baa015ec 100644
--- a/harbour/external/libpng/Makefile
+++ b/harbour/external/libpng/Makefile
@@ -16,19 +16,19 @@ endif
 LIBNAME := libpng
 
 ifeq ($(HB_WITH_LIBPNG),)
-   ifeq ($(HB_ARCHITECTURE),win)
+   ifeq ($(HB_PLATFORM),win)
       HB_WITH_LIBPNG := yes
    endif
-   ifeq ($(HB_ARCHITECTURE),wce)
+   ifeq ($(HB_PLATFORM),wce)
       HB_WITH_LIBPNG := yes
    endif
-   ifeq ($(HB_ARCHITECTURE),os2)
+   ifeq ($(HB_PLATFORM),os2)
       HB_WITH_LIBPNG := yes
    endif
-   ifeq ($(HB_ARCHITECTURE),dos)
+   ifeq ($(HB_PLATFORM),dos)
       HB_WITH_LIBPNG := yes
    endif
-   ifeq ($(HB_ARCHITECTURE),darwin)
+   ifeq ($(HB_PLATFORM),darwin)
       HB_WITH_LIBPNG := yes
    endif
    ifeq ($(HB_COMPILER),poccarm)
diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile
index 51395e5941..018f8d670c 100644
--- a/harbour/external/sqlite3/Makefile
+++ b/harbour/external/sqlite3/Makefile
@@ -9,10 +9,10 @@ include $(TOP)$(ROOT)config/global.mk
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
-ifeq ($(HB_ARCHITECTURE),wce)
+ifeq ($(HB_PLATFORM),wce)
    HB_CFLAGS += -D_WIN32_WCE
 endif
-ifeq ($(HB_ARCHITECTURE),dos)
+ifeq ($(HB_PLATFORM),dos)
    # DJGPP and OpenWatcom in DOS aren't correctly recognized by SQLite,
    # so we're forcing the next best available option. This will cause missing
    # externals though. [vszakats]
@@ -22,16 +22,16 @@ endif
 LIBNAME := sqlite3
 
 ifeq ($(HB_WITH_SQLITE3),)
-   ifeq ($(HB_ARCHITECTURE),win)
+   ifeq ($(HB_PLATFORM),win)
       HB_WITH_SQLITE3 := yes
    endif
-   ifeq ($(HB_ARCHITECTURE),wce)
+   ifeq ($(HB_PLATFORM),wce)
       HB_WITH_SQLITE3 := yes
    endif
-   ifeq ($(HB_ARCHITECTURE),os2)
+   ifeq ($(HB_PLATFORM),os2)
       HB_WITH_SQLITE3 := yes
    endif
-   ifeq ($(HB_ARCHITECTURE),dos)
+   ifeq ($(HB_PLATFORM),dos)
       HB_WITH_SQLITE3 := yes
    endif
    ifeq ($(HB_COMPILER),mingwarm)
diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec
index 13b814bc1e..f385e8ef75 100644
--- a/harbour/harbour-wce-spec
+++ b/harbour/harbour-wce-spec
@@ -87,13 +87,13 @@ rm -fR $RPM_BUILD_ROOT
 %build
 
 export HB_HOST_BUILD=yes
-export HB_ARCHITECTURE=linux
+export HB_PLATFORM=linux
 export HB_COMPILER=gcc
 export HB_USER_CFLAGS=
 make %{?_smp_mflags}
 
 export HB_HOST_BUILD=lib
-export HB_ARCHITECTURE=wce
+export HB_PLATFORM=wce
 export HB_COMPILER=mingwarm
 
 export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc"
@@ -122,7 +122,7 @@ make %{?_smp_mflags}
 # Install harbour itself.
 
 export HB_HOST_BUILD=lib
-export HB_ARCHITECTURE=wce
+export HB_PLATFORM=wce
 export HB_COMPILER=mingwarm
 
 export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc"
diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec
index f65b5f35ce..f81b058c9f 100644
--- a/harbour/harbour-win-spec
+++ b/harbour/harbour-win-spec
@@ -87,13 +87,13 @@ rm -fR $RPM_BUILD_ROOT
 %build
 
 export HB_HOST_BUILD=yes
-export HB_ARCHITECTURE=linux
+export HB_PLATFORM=linux
 export HB_COMPILER=gcc
 export HB_USER_CFLAGS=
 make %{?_smp_mflags}
 
 export HB_HOST_BUILD=lib
-export HB_ARCHITECTURE=win
+export HB_PLATFORM=win
 export HB_COMPILER=mingw
 
 export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc"
@@ -122,7 +122,7 @@ make %{?_smp_mflags}
 # Install harbour itself.
 
 export HB_HOST_BUILD=lib
-export HB_ARCHITECTURE=win
+export HB_PLATFORM=win
 export HB_COMPILER=mingw
 
 export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc"
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index cddd9018aa..b4a206585f 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -69,7 +69,7 @@
 %define version  2.0.0
 %define releasen beta2
 %define hb_pref  hb
-%define hb_arch  export HB_ARCHITECTURE=linux
+%define hb_plat  export HB_PLATFORM=linux
 %define hb_cc    export HB_COMPILER=gcc
 %define hb_cflag export HB_USER_CFLAGS=
 %define hb_lflag export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} %{?_with_static:-static}"
@@ -83,7 +83,7 @@
 %define hb_cmrc  export HB_COMMERCE=%{?_without_gpllib:yes}
 %define hb_ctrb  export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbtpathy hbhpdf hbvpdf hbziparc xhb rddsql %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_libharu:hbhpdf} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_fbsql:hbfbird} %{?_with_allegro:gtalleg}"
 %define hb_extrn export HB_EXTERNALLIBS=no
-%define hb_env   %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_extrn} ; %{hb_cmrc}
+%define hb_env   %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_extrn} ; %{hb_cmrc}
 %define hb_host  www.harbour-project.org
 %define readme   README.RPM
 ######################################################################
@@ -445,7 +445,7 @@ then
     for utl in hbmk2 hbrun hbi18n hbformat
     do
         pushd utils/${utl}
-        rm -fR "./${HB_ARCHITECTURE}/${HB_COMPILER}"
+        rm -fR "./${HB_PLATFORM}/${HB_COMPILER}"
         make install
         strip ${HB_BIN_INSTALL}/${utl}
         popd
diff --git a/harbour/mpkg_tgz.sh b/harbour/mpkg_tgz.sh
index dd9fa6cafc..5f670383fb 100755
--- a/harbour/mpkg_tgz.sh
+++ b/harbour/mpkg_tgz.sh
@@ -35,23 +35,23 @@ hb_exesuf=""
 if [ -z "$TMPDIR" ]; then TMPDIR="/tmp"; fi
 HB_INST_PREF="$TMPDIR/$name.bin.$USER.$$"
 
-if [ -z "$HB_ARCHITECTURE" ]; then
+if [ -z "$HB_PLATFORM" ]; then
     if [ "$OSTYPE" = "msdosdjgpp" ]; then
-        hb_arch="dos"
+        hb_plat="dos"
     else
-        hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null`
-        case "$hb_arch" in
-            *windows*|*mingw32*|msys*) hb_arch="win" ;;
-            *os/2*)                    hb_arch="os2" ;;
-            *dos)                      hb_arch="dos" ;;
-            *bsd)                      hb_arch="bsd" ;;
+        hb_plat=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null`
+        case "$hb_plat" in
+            *windows*|*mingw32*|msys*) hb_plat="win" ;;
+            *os/2*)                    hb_plat="os2" ;;
+            *dos)                      hb_plat="dos" ;;
+            *bsd)                      hb_plat="bsd" ;;
         esac
     fi
-    export HB_ARCHITECTURE="$hb_arch"
+    export HB_PLATFORM="$hb_plat"
 fi
 
 if [ -z "$HB_COMPILER" ]; then
-    case "$HB_ARCHITECTURE" in
+    case "$HB_PLATFORM" in
         win) HB_COMPILER="mingw" ;;
         dos) HB_COMPILER="djgpp" ;;
         *)   HB_COMPILER="gcc" ;;
@@ -67,7 +67,7 @@ HB_LIBDIRNAME="lib"
 ETC="/etc"
 
 HB_ARCH64=""
-if [ "$HB_ARCHITECTURE" = "linux" ]
+if [ "$HB_PLATFORM" = "linux" ]
 then
     HB_CPU=`uname -m`
     case "$HB_CPU" in
@@ -78,14 +78,14 @@ then
         *)
             ;;
     esac
-elif [ "$HB_ARCHITECTURE" = "hpux" ] || [ "$HB_ARCHITECTURE" = "sunos" ]
+elif [ "$HB_PLATFORM" = "hpux" ] || [ "$HB_PLATFORM" = "sunos" ]
 then
     export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC"
 fi
 
 # Select the platform-specific installation prefix and ownership
 HB_INSTALL_OWNER=root
-case "$HB_ARCHITECTURE" in
+case "$HB_PLATFORM" in
     darwin)
         [ -z "$HB_INSTALL_PREFIX" ] && HB_INSTALL_PREFIX="/usr/local"
         HB_INSTALL_GROUP=wheel
@@ -143,7 +143,7 @@ fi
 
 # Set other platform-specific build options
 if [ -z "$HB_GPM_MOUSE" ]; then
-    if [ "$HB_ARCHITECTURE" = "linux" ] && \
+    if [ "$HB_PLATFORM" = "linux" ] && \
        ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then
         HB_GPM_MOUSE=yes
     else
@@ -154,7 +154,7 @@ fi
 
 if [ -z "${HB_WITHOUT_GTSLN}" ]; then
     HB_WITHOUT_GTSLN=yes
-    case "$HB_ARCHITECTURE" in
+    case "$HB_PLATFORM" in
         linux|bsd|darwin|hpux|sunos)
             for dir in /usr /usr/local /sw /opt/local
             do
@@ -168,7 +168,7 @@ if [ -z "${HB_WITHOUT_GTSLN}" ]; then
     export HB_WITHOUT_GTSLN
 fi
 
-case "$HB_ARCHITECTURE" in
+case "$HB_PLATFORM" in
     linux)
         ;;
     darwin)
@@ -237,7 +237,7 @@ done
 if [ -f $HB_BIN_INSTALL/harbour${hb_exesuf} ]; then
     ${HB_CCPREFIX}strip $HB_BIN_INSTALL/harbour${hb_exesuf}
 fi
-if [ "$HB_ARCHITECTURE" != "hpux" ]; then
+if [ "$HB_PLATFORM" != "hpux" ]; then
     # Keep the size of the libraries to a minimim, but don't try to strip symlinks.
     ${HB_CCPREFIX}strip -S `find $HB_LIB_INSTALL -type f`
 fi
@@ -260,7 +260,7 @@ fi
 # check if we should rebuild tools with shared libs
 if [ "${hb_lnkso}" = yes ]
 then
-    case $HB_ARCHITECTURE in
+    case $HB_PLATFORM in
         darwin)     ADD_LIBS="$ADD_LIBS -lncurses -L/opt/local/lib -L/sw/lib" ;;
         dos|win)    ADD_LIBS="" ;;
         sunos)      ADD_LIBS="$ADD_LIBS -lcurses" ;;
@@ -276,7 +276,7 @@ then
     for utl in hbmk2 hbrun hbi18n hbformat hbtest
     do
         (cd "utils/${utl}"
-         rm -fR "./${HB_ARCHITECTURE}/${HB_COMPILER}"
+         rm -fR "./${HB_PLATFORM}/${HB_COMPILER}"
          $MAKE install
          ${HB_CCPREFIX}strip "${HB_BIN_INSTALL}/${utl}${hb_exesuf}")
     done
@@ -296,7 +296,7 @@ rm -fR "${HB_INST_PREF}"
 
 if [ -n "${hb_instfile}" ]; then
 
-   if [ "${HB_ARCHITECTURE}" = linux ]; then
+   if [ "${HB_PLATFORM}" = linux ]; then
       DO_LDCONFIG="&& ldconfig"
    else
       DO_LDCONFIG=""
diff --git a/harbour/source/Makefile b/harbour/source/Makefile
index 04f20e0137..e17014da1b 100644
--- a/harbour/source/Makefile
+++ b/harbour/source/Makefile
@@ -25,7 +25,7 @@ else
          DYNNAME_POST := -$(HB_DYN_VER)
       endif
 
-      ifeq ($(HB_ARCHITECTURE),win)
+      ifeq ($(HB_PLATFORM),win)
          ifeq ($(HB_COMPILER),bcc)
             DYNNAME_POST := $(DYNNAME_POST)-bcc
          else
@@ -38,7 +38,7 @@ else
             endif
          endif
       else
-         ifeq ($(HB_ARCHITECTURE),wce)
+         ifeq ($(HB_PLATFORM),wce)
             DYNNAME_POST := $(DYNNAME_POST)-wce
             ifeq ($(HB_CPU),arm)
                DYNNAME_POST := $(DYNNAME_POST)-arm
@@ -52,7 +52,7 @@ else
                endif
             endif
          else
-            ifeq ($(HB_ARCHITECTURE),os2)
+            ifeq ($(HB_PLATFORM),os2)
                DYNNAME_POST := $(DYNNAME_POST)-os2
             endif
          endif
@@ -80,17 +80,17 @@ else
          source/rtl/gtpca \
          source/rtl/gtstd
 
-      ifeq ($(HB_ARCHITECTURE),dos)
+      ifeq ($(HB_PLATFORM),dos)
          # for testing only. dos doesn't have .dlls.
          DYNDIRLIST_BASE += source/rtl/gtdos
       endif
-      ifeq ($(HB_ARCHITECTURE),os2)
+      ifeq ($(HB_PLATFORM),os2)
          DYNDIRLIST_BASE += source/rtl/gtos2
       endif
-      ifeq ($(HB_ARCHITECTURE),wce)
+      ifeq ($(HB_PLATFORM),wce)
          DYNDIRLIST_BASE += source/rtl/gtwvt source/rtl/gtgui
       endif
-      ifeq ($(HB_ARCHITECTURE),win)
+      ifeq ($(HB_PLATFORM),win)
          DYNDIRLIST_BASE += source/rtl/gtwvt source/rtl/gtgui source/rtl/gtwin
       endif
       ifeq ($(HB_OS_UNIX),yes)
diff --git a/harbour/source/main/harbour.c b/harbour/source/main/harbour.c
index 756c97a760..8e672b9845 100644
--- a/harbour/source/main/harbour.c
+++ b/harbour/source/main/harbour.c
@@ -106,8 +106,8 @@ const char * hb_verFlagsPRG( void )
 /* build time Harbour platform setting */
 const char * hb_verHB_PLAT( void )
 {
-#ifdef HB_ARCHITECTURE
-   return HB_ARCHITECTURE;
+#ifdef HB_PLATFORM
+   return HB_PLATFORM;
 #else
    return "";
 #endif
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index 5621b7b149..7a6b1eb5d9 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -19,7 +19,7 @@ LIBS := \
 
 include $(TOP)$(ROOT)config/lib.mk
 
-ifneq ($(HB_ARCHITECTURE),)
+ifneq ($(HB_PLATFORM),)
 ifneq ($(HB_COMPILER),)
 
 INSTALL_RULE_LIB := $(INSTALL_RULE)
diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c
index 95468e88f8..85a397afee 100644
--- a/harbour/source/pp/hbpp.c
+++ b/harbour/source/pp/hbpp.c
@@ -396,11 +396,11 @@ static int hb_pp_generateVerInfo( char * szVerFile, int iSVNID, char * szChangeL
          hb_xfree( pszEnv );
       }
 
-      pszEnv = hb_getenv( "HB_ARCHITECTURE" );
+      pszEnv = hb_getenv( "HB_PLATFORM" );
       if( pszEnv )
       {
          pszEscaped = hb_pp_escapeString( pszEnv );
-         fprintf( fout, "\n#define HB_ARCHITECTURE          \"%s\"\n", pszEscaped );
+         fprintf( fout, "\n#define HB_PLATFORM              \"%s\"\n", pszEscaped );
          hb_xfree( pszEscaped );
          hb_xfree( pszEnv );
       }
diff --git a/harbour/source/rdd/Makefile b/harbour/source/rdd/Makefile
index 4989519b61..56eb8b5789 100644
--- a/harbour/source/rdd/Makefile
+++ b/harbour/source/rdd/Makefile
@@ -6,7 +6,7 @@ ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
-ifneq ($(HB_ARCHITECTURE),wce)
+ifneq ($(HB_PLATFORM),wce)
    HB_PRGFLAGS := -gc3
 endif
 
diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile
index 024fb3dbb9..780d0d69fa 100644
--- a/harbour/source/rtl/Makefile
+++ b/harbour/source/rtl/Makefile
@@ -6,7 +6,7 @@ ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
-ifneq ($(HB_ARCHITECTURE),wce)
+ifneq ($(HB_PLATFORM),wce)
    HB_PRGFLAGS := -gc3
 endif
 
diff --git a/harbour/source/rtl/gtcrs/Makefile b/harbour/source/rtl/gtcrs/Makefile
index 25382df852..88c69ca850 100644
--- a/harbour/source/rtl/gtcrs/Makefile
+++ b/harbour/source/rtl/gtcrs/Makefile
@@ -24,7 +24,7 @@ endif
 ifeq ($(HB_WITHOUT_GTCRS),yes)
    HB_INC_CURSES :=
 endif
-ifeq ($(HB_ARCHITECTURE),os2)
+ifeq ($(HB_PLATFORM),os2)
    HB_INC_CURSES :=
 endif
 
diff --git a/harbour/source/rtl/gtdos/Makefile b/harbour/source/rtl/gtdos/Makefile
index 279dcf244f..0e929fa075 100644
--- a/harbour/source/rtl/gtdos/Makefile
+++ b/harbour/source/rtl/gtdos/Makefile
@@ -8,7 +8,7 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtdos
 
-ifeq ($(HB_ARCHITECTURE),dos)
+ifeq ($(HB_PLATFORM),dos)
 
 C_SOURCES := \
    gtdos.c \
diff --git a/harbour/source/rtl/gtgui/Makefile b/harbour/source/rtl/gtgui/Makefile
index f6fbc351b4..85c3486a62 100644
--- a/harbour/source/rtl/gtgui/Makefile
+++ b/harbour/source/rtl/gtgui/Makefile
@@ -9,10 +9,10 @@ include $(TOP)$(ROOT)config/global.mk
 LIBNAME := gtgui
 
 HB_WITH_GTGUI := no
-ifeq ($(HB_ARCHITECTURE),win)
+ifeq ($(HB_PLATFORM),win)
    HB_WITH_GTGUI := yes
 endif
-ifeq ($(HB_ARCHITECTURE),wce)
+ifeq ($(HB_PLATFORM),wce)
    HB_WITH_GTGUI := yes
 endif
 
diff --git a/harbour/source/rtl/gtos2/Makefile b/harbour/source/rtl/gtos2/Makefile
index 1fe685b50d..5f1817bc19 100644
--- a/harbour/source/rtl/gtos2/Makefile
+++ b/harbour/source/rtl/gtos2/Makefile
@@ -8,7 +8,7 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtos2
 
-ifeq ($(HB_ARCHITECTURE),os2)
+ifeq ($(HB_PLATFORM),os2)
 
 C_SOURCES := \
    gtos2.c \
diff --git a/harbour/source/rtl/gttrm/Makefile b/harbour/source/rtl/gttrm/Makefile
index ca5039a750..e44827e382 100644
--- a/harbour/source/rtl/gttrm/Makefile
+++ b/harbour/source/rtl/gttrm/Makefile
@@ -12,16 +12,16 @@ C_SOURCES := \
    gttrm.c \
 
 HB_WITH_GTTRM := yes
-ifeq ($(HB_ARCHITECTURE),win)
+ifeq ($(HB_PLATFORM),win)
    HB_WITH_GTTRM := no
 endif
-ifeq ($(HB_ARCHITECTURE),wce)
+ifeq ($(HB_PLATFORM),wce)
    HB_WITH_GTTRM := no
 endif
-ifeq ($(HB_ARCHITECTURE),dos)
+ifeq ($(HB_PLATFORM),dos)
    HB_WITH_GTTRM := no
 endif
-ifeq ($(HB_ARCHITECTURE),os2)
+ifeq ($(HB_PLATFORM),os2)
    HB_WITH_GTTRM := no
 endif
 ifeq ($(HB_COMPILER),cygwin)
diff --git a/harbour/source/rtl/gtwin/Makefile b/harbour/source/rtl/gtwin/Makefile
index 2e72109fcb..b5fe6c0cd8 100644
--- a/harbour/source/rtl/gtwin/Makefile
+++ b/harbour/source/rtl/gtwin/Makefile
@@ -8,7 +8,7 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtwin
 
-ifeq ($(HB_ARCHITECTURE),win)
+ifeq ($(HB_PLATFORM),win)
 
 C_SOURCES := \
    gtwin.c \
diff --git a/harbour/source/rtl/gtwvt/Makefile b/harbour/source/rtl/gtwvt/Makefile
index c10f3bb25e..9a1e9cd9c0 100644
--- a/harbour/source/rtl/gtwvt/Makefile
+++ b/harbour/source/rtl/gtwvt/Makefile
@@ -9,10 +9,10 @@ include $(TOP)$(ROOT)config/global.mk
 LIBNAME := gtwvt
 
 HB_WITH_GTWVT := no
-ifeq ($(HB_ARCHITECTURE),win)
+ifeq ($(HB_PLATFORM),win)
    HB_WITH_GTWVT := yes
 endif
-ifeq ($(HB_ARCHITECTURE),wce)
+ifeq ($(HB_PLATFORM),wce)
    HB_WITH_GTWVT := yes
 endif
 
diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile
index 8e669b01c6..266501bdac 100644
--- a/harbour/source/vm/Makefile
+++ b/harbour/source/vm/Makefile
@@ -35,7 +35,7 @@ endif
 
 DIRS :=
 
-ifeq ($(HB_ARCHITECTURE),win)
+ifeq ($(HB_PLATFORM),win)
    ifeq ($(HB_COMPILER),mingw)
       C_MAIN := mainwin.c
    else
@@ -43,11 +43,11 @@ ifeq ($(HB_ARCHITECTURE),win)
    endif
    DIRS := mainstd mainwin maindllh maindllp
 else
-   ifeq ($(HB_ARCHITECTURE),wce)
+   ifeq ($(HB_PLATFORM),wce)
       C_MAIN := mainwin.c
       DIRS := mainstd mainwin maindllh maindllp
    else
-      ifeq ($(HB_ARCHITECTURE),os2)
+      ifeq ($(HB_PLATFORM),os2)
          C_MAIN := mainstd.c
          DIRS := maindllh
       else
@@ -109,7 +109,7 @@ PRG_SOURCES := \
 LIBNAME := hbvm
 
 ifneq ($(HB_MT),yes)
-ifeq ($(HB_ARCHITECTURE),dos)
+ifeq ($(HB_PLATFORM),dos)
 ifneq ($(HB_COMPILER),djgpp)
 ifneq ($(HB_COMPILER),watcom)
    HB_MT := no
diff --git a/harbour/source/vm/cmdarg.c b/harbour/source/vm/cmdarg.c
index 71b88960ef..d5e2701203 100644
--- a/harbour/source/vm/cmdarg.c
+++ b/harbour/source/vm/cmdarg.c
@@ -600,8 +600,8 @@ const char * hb_verFlagsPRG( void )
 /* build time Harbour platform setting */
 const char * hb_verHB_PLAT( void )
 {
-#ifdef HB_ARCHITECTURE
-   return HB_ARCHITECTURE;
+#ifdef HB_PLATFORM
+   return HB_PLATFORM;
 #else
    return "";
 #endif
diff --git a/harbour/source/vm/vmmt/Makefile b/harbour/source/vm/vmmt/Makefile
index 004470cf2c..d640095531 100644
--- a/harbour/source/vm/vmmt/Makefile
+++ b/harbour/source/vm/vmmt/Makefile
@@ -9,17 +9,17 @@ include $(TOP)$(ROOT)config/global.mk
 vpath %.c ../
 vpath %.prg ../
 
-ifeq ($(HB_ARCHITECTURE),win)
+ifeq ($(HB_PLATFORM),win)
    ifeq ($(HB_COMPILER),mingw)
       C_MAIN := mainwin.c
    else
       C_MAIN := mainstd.c mainwin.c
    endif
 else
-   ifeq ($(HB_ARCHITECTURE),wce)
+   ifeq ($(HB_PLATFORM),wce)
       C_MAIN := mainwin.c
    else
-      ifeq ($(HB_ARCHITECTURE),os2)
+      ifeq ($(HB_PLATFORM),os2)
          C_MAIN := mainstd.c
       else
          C_MAIN := main.c
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index c77164eb56..3f8c101b24 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -519,8 +519,8 @@ msgstr "Gener
 
 #: hbmk2.prg:5758 hbmk2.prg:6471
 #, c-format
-msgid "assume specific platform. Same as HB_ARCHITECTURE envvar"
-msgstr "használja a megadott platform kódot. Ugyanaz mint a HB_ARCHITECTURE környezeti változó."
+msgid "assume specific platform. Same as HB_PLATFORM envvar"
+msgstr "használja a megadott platform kódot. Ugyanaz mint a HB_PLATFORM környezeti változó."
 
 #: hbmk2.prg:5769
 #, c-format
diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po
index 1b8d5f04e9..421bbc17fd 100644
--- a/harbour/utils/hbmk2/hbmk2.pt_BR.po
+++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po
@@ -817,8 +817,8 @@ msgstr "herdar todos os flags .prg/.c/linker (ou nenhum) provindos do Harbour "
 
 #: hbmk2.prg:6687
 #, c-format
-msgid "assume specific platform. Same as HB_ARCHITECTURE envvar"
-msgstr "assume uma arquitetura especˇfica. Semelhante … variavel HB_ARCHITECTURE"
+msgid "assume specific platform. Same as HB_PLATFORM envvar"
+msgstr "assume uma arquitetura especˇfica. Semelhante … variavel HB_PLATFORM"
 
 #: hbmk2.prg:6687
 #, c-format