diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c67065071a..100c377905 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,19 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-06-04 15:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed to make pos= files relativ to .hbc container location.
+    ! Fixed to not macro process pos= entries, because it breaks
+      ${lng} macros.
+    + Added -debugi18n messages for .po update.
+
+  * contrib/xhb/Makefile
+  + contrib/xhb/xhberr.c
+    + Added SETUNHANDLEDEXCEPTIONFILTER() as a dummy function,
+      actual code is commented and won't work in Harbour.
+      (borrowed from xhb)
+
 2009-06-04 14:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/xhb/Makefile
   + contrib/xhb/xhbsave.c
diff --git a/harbour/contrib/xhb/Makefile b/harbour/contrib/xhb/Makefile
index fa3831253b..a7ffd3b175 100644
--- a/harbour/contrib/xhb/Makefile
+++ b/harbour/contrib/xhb/Makefile
@@ -26,6 +26,7 @@ C_SOURCES=\
 	xhbat.c \
 	xhbcopyf.c \
 	xhbenum.c \
+	xhberrc.c \
 	xhbfunc.c \
 	xhbis.c \
 	xhbmsgs.c \
diff --git a/harbour/contrib/xhb/xhberrc.c b/harbour/contrib/xhb/xhberrc.c
new file mode 100644
index 0000000000..7c212adcbb
--- /dev/null
+++ b/harbour/contrib/xhb/xhberrc.c
@@ -0,0 +1,123 @@
+/*
+ * $Id: errorsys.prg,v 1.60 2009/02/23 21:00:20 ronpinkas Exp $
+ */
+
+/*
+ * Harbour Project source code:
+ * The default error handler
+ *
+ * Copyright 1999 Antonio Linares <alinares@fivetech.com>
+ * www - http://www.harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+#define HB_OS_WIN_USED
+
+#include "hbapi.h"
+#include "hbapiitm.h"
+#include "hbvm.h"
+#include "hbvmpub.h"
+#include "hbstack.h"
+#include "hbthread.h"
+
+#if 0
+
+static PHB_SYMB s_xHbFunc = NULL;
+
+LONG WINAPI PRGUnhandledExceptionFilter( EXCEPTION_POINTERS *ExceptionInfo )
+{
+   if( s_xHbFunc )
+   {
+      HB_ITEM Exception;
+      PHB_DYNS pDyn = hb_dynsymFind( "HB_CSTRUCTURE" );
+
+      Exception.type = HB_IT_NIL;
+
+      if( pDyn )
+      {
+         hb_vmPushSymbol( pDyn->pSymbol );
+         hb_vmPushNil();
+         hb_itemPushStaticString( "EXCEPTION_POINTERS", 18 );
+         hb_vmPushLong( 8 );
+         hb_vmDo( 2 );
+
+         if( hb_stackReturnItem()->type == HB_IT_OBJECT )
+         {
+            HB_ITEM_NEW( Buffer );
+            HB_ITEM Adopt;
+
+            hb_itemForwardValue( &Exception, hb_stackReturnItem() );
+
+            hb_itemPutCLStatic( &Buffer, (char *) ExceptionInfo, sizeof( EXCEPTION_POINTERS ) );
+
+            Adopt.type = HB_IT_LOGICAL;
+            Adopt.item.asLogical.value = FALSE;
+
+            hb_objSendMsg( &Exception, "Buffer", 2, &Buffer, &Adopt );
+         }
+      }
+
+      hb_vmPushSymbol( s_xHbFunc );
+      hb_vmPushNil();
+      hb_itemPushForward( &Exception );
+      hb_vmDo( 1 );
+   }
+
+   return hb_itemGetNL( hb_stackReturnItem() );
+}
+
+#endif
+
+HB_FUNC( SETUNHANDLEDEXCEPTIONFILTER )
+{
+#if 0
+   LPTOP_LEVEL_EXCEPTION_FILTER pDefaultHandler;
+
+   s_xHbFunc = ( PHB_SYMB ) hb_parptr( 1 );
+
+   pDefaultHandler = SetUnhandledExceptionFilter( PRGUnhandledExceptionFilter );
+
+   hb_retnl( ( LONG ) pDefaultHandler );
+#endif
+   /* Dummy in Harbour */
+   hb_retnl( 0 );
+}
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index b2458467f0..34c4eec453 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -4618,7 +4618,7 @@ STATIC PROCEDURE HBC_ProcessOne( hbmk, cFileName )
       DO CASE
       CASE Lower( Left( cLine, Len( "pos="         ) ) ) == "pos="           ; cLine := SubStr( cLine, Len( "pos="          ) + 1 )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
-            cItem := PathSepToTarget( hbmk, MacroProc( hbmk, StrStripQuote( cItem ), FN_DirGet( cFileName ) ) )
+            cItem := PathSepToTarget( hbmk, PathProc( StrStripQuote( cItem ), FN_DirGet( cFileName ) ) )
             IF AScan( hbmk[ _HBMK_aPO ], {|tmp| tmp == cItem } ) == 0
                AAddNotEmpty( hbmk[ _HBMK_aPO ], cItem )
             ENDIF
@@ -5508,6 +5508,12 @@ STATIC PROCEDURE UpdatePO( hbmk, aPOTIN )
       AAdd( aUpd, cLNG )
    NEXT
 
+   IF hbmk[ _HBMK_lDEBUGI18N ]
+      hbmk_OutStd( hbmk, hb_StrFormat( "UpdatePO: file .pot list: %1$s", ArrayToList( aPOTIN, ", " ) ) )
+      hbmk_OutStd( hbmk, hb_StrFormat( "UpdatePO: for .po: %1$s", hbmk[ _HBMK_cPO ] ) )
+      hbmk_OutStd( hbmk, hb_StrFormat( "UpdatePO: for languages: %1$s", ArrayToList( hbmk[ _HBMK_aLNG ], ", " ) ) )
+   ENDIF
+
    IF Empty( hbmk[ _HBMK_aLNG ] ) .OR. !( _LNG_MARKER $ hbmk[ _HBMK_cPO ] )
       hbmk_OutStd( hbmk, hb_StrFormat( I_( "Updated .po file '%1$s'" ), hbmk[ _HBMK_cPO ] ) )
    ELSE