diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 40f618f0a4..9173eb0afa 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-06 15:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbpost.hbm
+    ! Fixed to create dynlibs and executables in -fullshared mode
+      if HB_SYSLOC is 'yes. I've yet to test this.
+
 2010-08-06 15:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * ChangeLog
   * include/harbour.hbx
diff --git a/harbour/contrib/hbpost.hbm b/harbour/contrib/hbpost.hbm
index 92f0b52301..98e16d2f03 100644
--- a/harbour/contrib/hbpost.hbm
+++ b/harbour/contrib/hbpost.hbm
@@ -34,7 +34,8 @@
 {HB_BUILD_DEBUG}-debug
 {HB_BUILD_DEBUG}-cflag=-DHB_TR_LEVEL_DEBUG
 
-{(hbdyn|hbexe)&HB_BUILD_SHARED='yes'}-shared
+{(hbdyn|hbexe)&HB_BUILD_SHARED='yes'&!(HB_SYSLOC='yes')}-shared
+{(hbdyn|hbexe)&HB_BUILD_SHARED='yes'&HB_SYSLOC='yes'}-fullshared
 
 # Experimental
 {_HB_BUILD_LIBDYN}-hbdyn