diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 811cfbb607..8222200b64 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,38 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-17 02:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * make_gnu.sh
+  * config/global.cf
+    + Readded HB_GPM_MOUSE detection to starter script.
+    ; TOFIX: This logic should be moved to GNU Make global.cf.
+    + Readded HB_COMMERCE logic but now to global.cf, to
+      deal with Harbour-wide settings, currently this is only
+      HB_GPM_MOUSE. lib-specific HB_COMMERCE issues should be
+      handled in local Makefiles.
+
+  * config/global.cf
+    * Minor formatting.
+    * TODO added (host CPU detection on non-win platforms).
+
+  * config/hpux/gcc.cf
+  * config/darwin/gcc.cf
+  * config/global.cf
+  * config/sunos/gcc.cf
+  * config/bsd/gcc.cf
+    - GPM isn't available on these platforms so it's not necessary
+      to handle it in these make files.
+
+  * utils/hbmk2/Makefile
+  * utils/hbrun/Makefile
+    ! Changed ordering of hbcpl/hbpp/hbcommon libs to this:
+      hbcplr, hbpp, hbcommon
+        (from this: hbpp, hbcplr, hbcommon
+         and this: hbcommon, hbpp, hbcplr)
+      This syncs it with existing .hbp lib order and hopefully
+      fixes link problems on sunos/sparc, reported by a user.
+      Please retest & report results.
+
 2009-07-16 23:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   - examples/hbdoc/examples/hbmisc/gendoc.bat
   + examples/hbdoc/examples/hbmisc/readme.txt
diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf
index 954d2b8e8d..b1c85c04d9 100644
--- a/harbour/config/bsd/gcc.cf
+++ b/harbour/config/bsd/gcc.cf
@@ -73,12 +73,6 @@ LINKLIBS += -lX11
 LINKPATHS += -L/usr/X11R6/lib
 endif
 
-# HB_GPM_MOUSE: use gpm mouse driver
-# Actually, there is no gpm on BSD.
-ifeq ($(HB_GPM_MOUSE),yes)
-LINKLIBS += -lgpm
-endif
-
 LINKPATHS += -L/usr/local/lib
 
 endif
diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf
index 49aff6e294..5e257ee448 100644
--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -85,12 +85,6 @@ LINKLIBS += -lX11
 LINKPATHS += -L/usr/X11R6/lib
 endif
 
-# HB_GPM_MOUSE: use gpm mouse driver
-# Actually, there is no gpm on BSD.
-ifeq ($(HB_GPM_MOUSE),yes)
-LINKLIBS += -lgpm
-endif
-
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index 4c3e51310f..e7f7857832 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -162,7 +162,6 @@ ifeq ($(HB_HOST_ARCH),)
    endif
 endif
 
-
 ifeq ($(HB_HOST_ARCH),)
    ifneq ($(OS2_SHELL),)
       HB_HOST_ARCH := os2
@@ -196,6 +195,8 @@ ifeq ($(HB_HOST_ARCH),win)
          HB_HOST_CPU := x86
       endif
    endif
+else
+   # TODO: CPU detection for rest of systems.
 endif
 
 ifeq ($(HB_BUILD_VERBOSE),yes)
@@ -207,7 +208,7 @@ endif
 # TODO: Set this in <arch>/<comp>.cf
 HB_CPU :=
 ifeq ($(HB_ARCHITECTURE),win)
-   ifeq      ($(HB_COMPILER),msvc64)
+   ifeq ($(HB_COMPILER),msvc64)
       HB_CPU := x86_64
    else
       ifeq ($(HB_COMPILER),mingw64)
@@ -315,6 +316,11 @@ ifneq ($(HB_HOST_ARCH)$(HB_HOST_CPU),$(HB_ARCHITECTURE)$(HB_CPU))
    endif
 endif
 
+# Exclude Harbour-wide features prohibiting commercial usage
+ifeq ($(HB_COMMERCE),yes)
+   HB_GPM_MOUSE := no
+endif
+
 # Names of portable GT drivers
 HB_GT_LIBS=\
 	gtcgi \
diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf
index 957f4c376b..72831b1c51 100644
--- a/harbour/config/hpux/gcc.cf
+++ b/harbour/config/hpux/gcc.cf
@@ -72,11 +72,6 @@ LINKLIBS += -lX11
 LINKPATHS += -L/usr/X11R6/lib
 endif
 
-# HB_GPM_MOUSE: use gpm mouse driver
-ifeq ($(HB_GPM_MOUSE),yes)
-LINKLIBS += -lgpm
-endif
-
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf
index 6437b06155..513114949e 100644
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -68,11 +68,6 @@ LINKLIBS += -lX11
 LINKPATHS += -L/usr/X11R6/lib
 endif
 
-# HB_GPM_MOUSE: use gpm mouse driver
-ifeq ($(HB_GPM_MOUSE),yes)
-LINKLIBS += -lgpm
-endif
-
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh
index 0cc0972fe2..7c30b8014f 100755
--- a/harbour/make_gnu.sh
+++ b/harbour/make_gnu.sh
@@ -51,6 +51,16 @@ then
     export HB_ARCHITECTURE=win
 fi
 
+if [ -z "$HB_GPM_MOUSE" ]; then
+    if [ "$HB_ARCHITECTURE" = "linux" ] && \
+       ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then
+        HB_GPM_MOUSE=yes
+    else
+        HB_GPM_MOUSE=no
+    fi
+    export HB_GPM_MOUSE
+fi
+
 if [ "$HB_ARCHITECTURE" = "linux" ]
 then
     if [ "${HB_USER_CFLAGS}" == "${HB_USER_CFLAGS//-fPIC/}" ]
diff --git a/harbour/utils/hbmk2/Makefile b/harbour/utils/hbmk2/Makefile
index 2006053651..927fcd8c49 100644
--- a/harbour/utils/hbmk2/Makefile
+++ b/harbour/utils/hbmk2/Makefile
@@ -23,8 +23,8 @@ LIBS=\
 	hbrtl \
 	hbvmmt \
 	hbmacro \
-	hbcommon \
-	hbpp \
 	hbcplr \
+	hbpp \
+	hbcommon \
 
 include $(TOP)$(ROOT)config/bin.cf
diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile
index c8fb23ac20..520da29742 100644
--- a/harbour/utils/hbrun/Makefile
+++ b/harbour/utils/hbrun/Makefile
@@ -24,8 +24,8 @@ LIBS=\
 	hbrtl \
 	hbvm \
 	hbmacro \
-	hbpp \
 	hbcplr \
+	hbpp \
 	hbcommon \
 
 ifeq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)