diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1b7e560aa7..488194a8af 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-04 03:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * source/vm/dynlibhb.c
+    ! Fixed to not use dl*() functions on linux/sunpro.
+
+  * config/linux/sunpro.cf
+    ! Fixed to include gpm lib.
+
+  ; TOFIX: linux/sunpro linking dies on:
+           ../../../../../lib/linux/sunpro/libhbpcre.a(pcrecomp.o): In function `check_auto_possessive':
+           pcrecomp.c:(.text+0x2952): undefined reference to `.CG4A.3263'
+           pcrecomp.c:(.text+0x2959): undefined reference to `.CG4A.3263'
+           pcrecomp.c:(.text+0x2b29): undefined reference to `.CG40.3253'
+           pcrecomp.c:(.text+0x2b30): undefined reference to `.CG40.3253'
+
 2009-08-04 03:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbqt_slots.cpp
     ! Deleted windows.h.
diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf
index fc459e1f43..bff625f435 100644
--- a/harbour/config/linux/sunpro.cf
+++ b/harbour/config/linux/sunpro.cf
@@ -82,6 +82,11 @@ endif
 
 endif
 
+# HB_GPM_MOUSE: use gpm mouse driver
+ifeq ($(HB_GPM_MOUSE),yes)
+LINKLIBS += -lgpm
+endif
+
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
 LINKLIBS += -lpcre
 endif
diff --git a/harbour/source/vm/dynlibhb.c b/harbour/source/vm/dynlibhb.c
index cf34d218a3..fce8e81539 100644
--- a/harbour/source/vm/dynlibhb.c
+++ b/harbour/source/vm/dynlibhb.c
@@ -64,7 +64,7 @@
 #include "hbstack.h"
 #include "hbvm.h"
 
-#if defined( HB_OS_LINUX ) && !defined( __WATCOMC__ )
+#if defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) && !defined( __SUNPRO_C ) && !defined( __SUNPRO_CC )
 #  include <dlfcn.h>
 #endif
 
@@ -104,7 +104,7 @@ HB_FUNC( HB_LIBLOAD )
                                ( PCSZ ) hb_parc( 1 ), &hDynModule ) == NO_ERROR )
                hDynLib = ( void * ) hDynModule;
          }
-#elif defined( HB_OS_LINUX ) && !defined( __WATCOMC__ )
+#elif defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) && !defined( __SUNPRO_C ) && !defined( __SUNPRO_CC )
          hDynLib = ( void * ) dlopen( hb_parc( 1 ), RTLD_LAZY | RTLD_GLOBAL );
 #endif
          /* set real marker */
@@ -144,7 +144,7 @@ HB_FUNC( HB_LIBFREE )
          fResult = FreeLibrary( ( HMODULE ) hDynLib );
 #elif defined( HB_OS_OS2 )
          fResult = DosFreeModule( ( HMODULE ) hDynLib ) == NO_ERROR;
-#elif defined( HB_OS_LINUX ) && !defined( __WATCOMC__ )
+#elif defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) && !defined( __SUNPRO_C ) && !defined( __SUNPRO_CC )
          fResult = dlclose( hDynLib ) == 0;
 #endif
       }
@@ -155,7 +155,7 @@ HB_FUNC( HB_LIBFREE )
 
 HB_FUNC( HB_LIBERROR )
 {
-#if defined( HB_OS_LINUX ) && !defined( __WATCOMC__ )
+#if defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) && !defined( __SUNPRO_C ) && !defined( __SUNPRO_CC )
    hb_retc( dlerror() );
 #else
    hb_retc_null();