diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5f22fe6c6a..eb75fcae48 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,23 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-15 10:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  - utils/hbextern
+  + examples/hbextern
+  - examples/hbextern/make_c5x.bat
+  * examples/hbextern/hbextern.prg
+  + examples/hbextern/hbextern.hbp
+  - examples/hbextern/Makefile
+    * hbextern tool moved to examples.
+    - Deleted Clipper build batch file.
+    + Added hbmk2 build file.
+
+  * utils/hbmk2/examples/minigui.hbc
+    + Added xhb compatbility (untested).
+
+  * contrib/Makefile
+    + Enabled hbxbp lib to be built by default.
+
 2009-06-15 00:51 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/hbqt/generator/hbqtgen.prg
     + Added -inbuids switch which generate these sources only:
diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile
index 5b7efc8b22..a9de2e6247 100644
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -24,6 +24,7 @@ DIRS=\
 	hbtpathy \
 	hbvpdf \
 	hbwin \
+	hbxbp \
 	hbziparc \
 	rddado \
 	xhb \
diff --git a/harbour/examples/hbextern/hbextern.hbp b/harbour/examples/hbextern/hbextern.hbp
new file mode 100644
index 0000000000..9dabc5b604
--- /dev/null
+++ b/harbour/examples/hbextern/hbextern.hbp
@@ -0,0 +1,7 @@
+#
+# $Id$
+#
+
+-nulrdd
+
+hbextern.prg
diff --git a/harbour/utils/hbextern/hbextern.prg b/harbour/examples/hbextern/hbextern.prg
similarity index 96%
rename from harbour/utils/hbextern/hbextern.prg
rename to harbour/examples/hbextern/hbextern.prg
index 06c7eb72ec..c346a8a7f6 100644
--- a/harbour/utils/hbextern/hbextern.prg
+++ b/harbour/examples/hbextern/hbextern.prg
@@ -158,10 +158,10 @@ STATIC PROCEDURE ProcessLine( nOutput, cLine, lPRG )
             cLine := LTrim( SubStr( cLine, nPos ) )
             nLen  := len( cLine )
             FOR nPos := 1 TO nLen
-                IF SubStr( cLine, nPos, 1 ) $ " (;/&" + Chr( 9 )
-                   --nPos
-                   EXIT
-                ENDIF
+               IF SubStr( cLine, nPos, 1 ) $ " (;/&" + Chr( 9 )
+                  --nPos
+                  EXIT
+               ENDIF
             NEXT
             WriteSymbol( nOutput, SubStr( cLine, 1, nPos ) )
          ENDIF
@@ -207,10 +207,10 @@ STATIC FUNCTION FReadLn( nHandle, cBuffer, nMaxLine, cDelim )
    nSavePos := FSEEK( nHandle, 0, FS_RELATIVE )
    nNumRead := FREAD( nHandle, @cLine, nMaxLine )
    IF ( nEol := AT( cDelim, substr( cLine, 1, nNumRead ) ) ) == 0
-     cBuffer := cLine
+      cBuffer := cLine
    ELSE
-     cBuffer := SubStr( cLine, 1, nEol - 1 )
-     FSEEK( nHandle, nSavePos + nEol + 1, FS_SET )
+      cBuffer := SubStr( cLine, 1, nEol - 1 )
+      FSEEK( nHandle, nSavePos + nEol + 1, FS_SET )
    ENDIF
 
    RETURN nNumRead != 0
diff --git a/harbour/utils/hbextern/Makefile b/harbour/utils/hbextern/Makefile
deleted file mode 100644
index 89c50c3147..0000000000
--- a/harbour/utils/hbextern/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# $Id$
-#
-
-ifeq ($(HB_MAIN),)
-HB_MAIN = std
-endif
-
-ROOT = ../../
-
-PRG_SOURCES=\
-	hbextern.prg \
-
-PRG_MAIN=hbextern.prg
-
-LIBS=\
-	hbdebug \
-	hbvm \
-	hbrtl \
-	hblang \
-	hbrdd \
-	hbrtl \
-	hbvm \
-	hbmacro \
-	hbpp \
-	hbcommon \
-
-include $(TOP)$(ROOT)config/bin.cf
diff --git a/harbour/utils/hbextern/make_c5x.bat b/harbour/utils/hbextern/make_c5x.bat
deleted file mode 100644
index 1b7edea037..0000000000
--- a/harbour/utils/hbextern/make_c5x.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@rem
-@rem $Id$
-@rem
-
-@echo off
-
-clipper hbextern.prg /w /n /i..\..\include\
-rtlink fi hbextern
-del *.obj
diff --git a/harbour/utils/hbmk2/examples/minigui.hbc b/harbour/utils/hbmk2/examples/minigui.hbc
index 3468925fd0..467444d51c 100644
--- a/harbour/utils/hbmk2/examples/minigui.hbc
+++ b/harbour/utils/hbmk2/examples/minigui.hbc
@@ -7,7 +7,9 @@
 # > hbmk2 test.prg C:\minihui\minigui.hbc
 
 {win}incpaths=include
-{win}libpaths=lib harbour/lib
+{win}libpaths=lib
+{win&!xhb}libpaths=harbour/lib
+{win&xhb}libpaths=xLib
 
 {win}gt=gtgui
 gui=yes
@@ -19,6 +21,7 @@ gui=yes
 # core (binary)
 {bcc}libs=dll hbprinter miniprint TMsAgent
 # Harbour contribs
-{win}libs=hbmzip hbwin
+{win}libs=hbmzip
+{win&!xhb}libs=hbwin
 # system
 {win}libs=vfw32