diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1f8b504365..c98338f841 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+
+2011-09-15 23:47 UTC-0500 Teo Fonrouge (teo/at/windtelsoft/dot/com)
+  *  contrib/hbrun/hbrun.hbp
+     ! Fixed linking on recent linux distros (i.e. F15) that are using the
+       ld DSO linking model which requires specific declaration of objs/libs.
+       Added specific declaration on linux of:
+         * -lz (conditionated by HB_HAS_ZLIB_LOCAL)
+         * -lm
 2011-09-13 10:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.*.po
   * utils/hbmk2/hbmk2.prg
diff --git a/harbour/contrib/hbrun/hbrun.hbp b/harbour/contrib/hbrun/hbrun.hbp
index 1c88eed77d..125fcc46b2 100644
--- a/harbour/contrib/hbrun/hbrun.hbp
+++ b/harbour/contrib/hbrun/hbrun.hbp
@@ -2,6 +2,10 @@
 # $Id$
 #
 
+# Required by some recent Linux distros that are using the DSO linking model
+-ldflag{!HB_HAS_ZLIB_LOCAL&linux}=-lz
+-ldflag{linux}=-lm
+
 -w3 -es2 -l
 -kmo