diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0454882bd6..82811bbbd4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-12-21 10:05 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+    * respect -fPIC used to create Harbour binaries in default
+      GCC switches used by hb* scripts
+
 2007-12-20 15:56 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/make_rpmw32.sh
     * moved -maxdepth option before actions and expressions in find
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index b599aae353..5edda5c99e 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -161,17 +161,20 @@ mk_hbtools()
         HB_SLN_LIB="slang"
     fi
     if [ "${C_USR//-mlp64/}" != "${C_USR}" ]; then
-        CC_L_USR="${CC_L_USR} -mlp64"
         CC_C_USR="${CC_C_USR} -mlp64"
+        CC_L_USR="${CC_L_USR} -mlp64"
     elif [ "${C_USR//-mlp32/}" != "${C_USR}" ]; then
-        CC_L_USR="${CC_L_USR} -mlp32"
         CC_C_USR="${CC_C_USR} -mlp32"
+        CC_L_USR="${CC_L_USR} -mlp32"
     elif [ "${C_USR//-m64/}" != "${C_USR}" ]; then
-        CC_L_USR="${CC_L_USR} -m64"
         CC_C_USR="${CC_C_USR} -m64"
+        CC_L_USR="${CC_L_USR} -m64"
     elif [ "${C_USR//-m32/}" != "${C_USR}" ]; then
-        CC_L_USR="${CC_L_USR} -m32"
         CC_C_USR="${CC_C_USR} -m32"
+        CC_L_USR="${CC_L_USR} -m32"
+    fi
+    if [ "${C_USR//-fPIC/}" != "${C_USR}" ]; then
+        CC_C_USR="${CC_L_USR} -fPIC"
     fi
 
     echo "Generating ${hb_tool}... "