diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 44c14a6251..d6bf768565 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-14 09:43 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/gtcrs/Makefile
+  * harbour/source/rtl/gttrm/Makefile
+  * harbour/source/rtl/gtsln/Makefile
+    * disabled GPM when HB_GPM_MOUSE=no or HB_COMMERCE=yes
+      Please remember that GPM is pure GPL library.
+
 2009-07-14 03:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     * Let's assume 32-bit / little-endian CPU platforms for
diff --git a/harbour/source/rtl/gtcrs/Makefile b/harbour/source/rtl/gtcrs/Makefile
index c0aa7b5af6..2d749eeae6 100644
--- a/harbour/source/rtl/gtcrs/Makefile
+++ b/harbour/source/rtl/gtcrs/Makefile
@@ -27,8 +27,13 @@ HB_INC_CURSES_OK += $(foreach d, $(HB_INC_CURSES), $(if $(wildcard $(d)/curses.h
 
 ifneq ($(strip $(HB_INC_CURSES_OK)),)
 
+HB_INC_GPM_OK =
+ifneq ($(HB_GPM_MOUSE),no)
+ifneq ($(HB_COMMERCE),yes)
 HB_INC_GPM = /usr/include /usr/local/include
 HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),))
+endif
+endif
 
 ifeq ($(HB_GT_CRS_BCEHACK),yes)
   HB_USER_CFLAGS += -DHB_GT_CRS_BCEHACK
diff --git a/harbour/source/rtl/gtsln/Makefile b/harbour/source/rtl/gtsln/Makefile
index 4e256a91c0..ca0f00dd97 100644
--- a/harbour/source/rtl/gtsln/Makefile
+++ b/harbour/source/rtl/gtsln/Makefile
@@ -34,8 +34,13 @@ HB_INC_SLANG_OK += $(foreach d, $(HB_INC_SLANG), $(if $(wildcard $(d)/slang.h),$
 
 ifneq ($(strip $(HB_INC_SLANG_OK)),)
 
+HB_INC_GPM_OK =
+ifneq ($(HB_GPM_MOUSE),no)
+ifneq ($(HB_COMMERCE),yes)
 HB_INC_GPM = /usr/include /usr/local/include
 HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),))
+endif
+endif
 
 ifneq ($(strip $(HB_INC_GPM_OK)),)
   HB_USER_CFLAGS += -DHAVE_GPM_H
diff --git a/harbour/source/rtl/gttrm/Makefile b/harbour/source/rtl/gttrm/Makefile
index 06093ed168..e29ff03048 100644
--- a/harbour/source/rtl/gttrm/Makefile
+++ b/harbour/source/rtl/gttrm/Makefile
@@ -28,8 +28,13 @@ endif
 
 ifeq ($(HB_WITH_GTTRM),yes)
 
+HB_INC_GPM_OK =
+ifneq ($(HB_GPM_MOUSE),no)
+ifneq ($(HB_COMMERCE),yes)
 HB_INC_GPM = /usr/include /usr/local/include
 HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),))
+endif
+endif
 
 ifneq ($(strip $(HB_INC_GPM_OK)),)
   CFLAGS += -DHAVE_GPM_H