diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9e9890b8fd..a6138487a1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,22 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-06-08 00:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * examples/superlib/superlib.hbp
+  * examples/ps32/ps32.hbp
+  * examples/gfspell/gfspell.hbp
+  * examples/rddado/rddado.hbp
+  * examples/hbapollo/hbapollo.hbp
+  * examples/hbvpdf/hbvpdf.hbp
+  * examples/hbbtree/hbbtree.hbp
+  * examples/hbbtree/hbbtree.hbc
+  * examples/gtwvw/gtwvw.hbp
+  * examples/gtwvw/gtwvw.hbc
+    ! synced libpaths in .hbp and .hbc files. it also means multitarget support
+
+  * contrib/hbmxml/3rd/minixml/config.h
+    ! fixed redefinition of strdup() macro (upstream bug) [Tamas Tevesz]
+
 2011-06-07 15:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/ideactions.prg
   * contrib/hbide/idemain.prg
@@ -24,8 +40,8 @@
 
   * contrib/hbide/idesaveload.prg
   * contrib/hbide/idechangelog.prg
-    + Fixed: "Changelog User" was sharing a similar looking 
-      instance variable name.    
+    + Fixed: "Changelog User" was sharing a similar looking
+      instance variable name.
 
 2011-06-07 11:45 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/changelog.ui
@@ -41,33 +57,33 @@
 
 2011-06-06 18:13 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idechangelog.prg
-    * Changed: behavior of "Current Log Entry" to scroll to last 
+    * Changed: behavior of "Current Log Entry" to scroll to last
       after an element is added.
   * contrib/hbide/ideactions.prg
   * contrib/hbide/idemain.prg
     * Changed: "Setup/CodePage" menu to display Harbour recognized
       codepage name alsong its unique id.
 
-      Let me know if that makes the whole list of Harbour's 
+      Let me know if that makes the whole list of Harbour's
       code pages.
 
 2011-06-06 15:37 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idechangelog.prg
   * contrib/hbide/idesaveload.prg
-    + Implemented: to remember the position and size of 
+    + Implemented: to remember the position and size of
       ChangeLog(s) dialog.
 
 2011-06-06 14:47 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/changelog.ui
   * contrib/hbide/idechangelog.prg
     * Changed: the way "Current Log Entry" is built. Now user can
-      edit the contents of built entry. 
-    ; NOTE: 1. Action tokens should be preserved as is when editing 
+      edit the contents of built entry.
+    ; NOTE: 1. Action tokens should be preserved as is when editing
                built log entry.
-            2. If a new line be inserted in "Descriptions" start 
+            2. If a new line be inserted in "Descriptions" start
                it from the column 1, hbIDE will auto format when saving.
-            3. If indentation is needed in "Descriptions" then start 
-               a new line at column 15 or higher only, just below where ": " 
+            3. If indentation is needed in "Descriptions" then start
+               a new line at column 15 or higher only, just below where ": "
                seperates action token.
 
 2011-06-06 21:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
diff --git a/harbour/contrib/hbmxml/3rd/minixml/config.h b/harbour/contrib/hbmxml/3rd/minixml/config.h
index 5e4fe1f879..626e1fadc8 100644
--- a/harbour/contrib/hbmxml/3rd/minixml/config.h
+++ b/harbour/contrib/hbmxml/3rd/minixml/config.h
@@ -87,6 +87,9 @@
 
 #  ifndef HAVE_STRDUP
 extern char	*_mxml_strdup(const char *);
+#  if defined( strdup )
+#     undef strdup
+#  endif
 #    define strdup _mxml_strdup
 #  endif /* !HAVE_STRDUP */
 
diff --git a/harbour/examples/gfspell/gfspell.hbp b/harbour/examples/gfspell/gfspell.hbp
index 3d2dc3281d..d3cb52d361 100644
--- a/harbour/examples/gfspell/gfspell.hbp
+++ b/harbour/examples/gfspell/gfspell.hbp
@@ -5,7 +5,7 @@
 -hblib
 -inc
 
--o${hb_name}
+-olib/${hb_plat}/${hb_comp}/${hb_name}
 
 -w1 -es2
 
diff --git a/harbour/examples/gtwvw/gtwvw.hbc b/harbour/examples/gtwvw/gtwvw.hbc
index a2ecc1c780..35a27311b8 100644
--- a/harbour/examples/gtwvw/gtwvw.hbc
+++ b/harbour/examples/gtwvw/gtwvw.hbc
@@ -5,6 +5,7 @@
 {!allwin|!x86}skip=yes
 
 incpaths=.
+libpaths=lib/${hb_plat}/${hb_comp}
 
 gt=${hb_name}
 gui=yes
diff --git a/harbour/examples/gtwvw/gtwvw.hbp b/harbour/examples/gtwvw/gtwvw.hbp
index 5a6006fdc2..290beefbb3 100644
--- a/harbour/examples/gtwvw/gtwvw.hbp
+++ b/harbour/examples/gtwvw/gtwvw.hbp
@@ -5,7 +5,7 @@
 -hblib
 -inc
 
--o${hb_name}
+-olib/${hb_plat}/${hb_comp}/${hb_name}
 
 -w3 -es2
 
diff --git a/harbour/examples/hbapollo/hbapollo.hbp b/harbour/examples/hbapollo/hbapollo.hbp
index d2d2b55c73..f90f535644 100644
--- a/harbour/examples/hbapollo/hbapollo.hbp
+++ b/harbour/examples/hbapollo/hbapollo.hbp
@@ -5,7 +5,7 @@
 -hblib
 -inc
 
--o${hb_name}
+-olib/${hb_plat}/${hb_comp}/${hb_name}
 
 -w3 -es2
 
diff --git a/harbour/examples/hbbtree/hbbtree.hbc b/harbour/examples/hbbtree/hbbtree.hbc
index d73afd134a..f4d06b7f71 100644
--- a/harbour/examples/hbbtree/hbbtree.hbc
+++ b/harbour/examples/hbbtree/hbbtree.hbc
@@ -3,5 +3,6 @@
 #
 
 incpaths=.
+libpaths=lib/${hb_plat}/${hb_comp}
 
 libs=${hb_name}
diff --git a/harbour/examples/hbbtree/hbbtree.hbp b/harbour/examples/hbbtree/hbbtree.hbp
index 54536e0166..cff0d67344 100644
--- a/harbour/examples/hbbtree/hbbtree.hbp
+++ b/harbour/examples/hbbtree/hbbtree.hbp
@@ -5,7 +5,7 @@
 -hblib
 -inc
 
--o${hb_name}
+-olib/${hb_plat}/${hb_comp}/${hb_name}
 
 -w3 -es2
 
diff --git a/harbour/examples/hbvpdf/hbvpdf.hbp b/harbour/examples/hbvpdf/hbvpdf.hbp
index e9cab14e8c..2ba8a55e16 100644
--- a/harbour/examples/hbvpdf/hbvpdf.hbp
+++ b/harbour/examples/hbvpdf/hbvpdf.hbp
@@ -5,7 +5,7 @@
 -hblib
 -inc
 
--o${hb_name}
+-olib/${hb_plat}/${hb_comp}/${hb_name}
 
 -w3 -es2
 
diff --git a/harbour/examples/ps32/ps32.hbp b/harbour/examples/ps32/ps32.hbp
index 5525c04b04..9cec1cb36d 100644
--- a/harbour/examples/ps32/ps32.hbp
+++ b/harbour/examples/ps32/ps32.hbp
@@ -5,7 +5,7 @@
 -hblib
 -inc
 
--o${hb_name}
+-olib/${hb_plat}/${hb_comp}/${hb_name}
 
 -w2 -es2
 
diff --git a/harbour/examples/rddado/rddado.hbp b/harbour/examples/rddado/rddado.hbp
index 58fc5ac4dc..d4025d07b9 100644
--- a/harbour/examples/rddado/rddado.hbp
+++ b/harbour/examples/rddado/rddado.hbp
@@ -5,7 +5,7 @@
 -hblib
 -inc
 
--o${hb_name}
+-olib/${hb_plat}/${hb_comp}/${hb_name}
 
 -w3 -es2
 
diff --git a/harbour/examples/superlib/superlib.hbp b/harbour/examples/superlib/superlib.hbp
index 716e8220a6..469a2c069e 100644
--- a/harbour/examples/superlib/superlib.hbp
+++ b/harbour/examples/superlib/superlib.hbp
@@ -5,7 +5,7 @@
 -hblib
 -inc
 
--o${hb_name}
+-olib/${hb_plat}/${hb_comp}/${hb_name}
 
 -w1 -es2