diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4ea8b964c9..bb0d2779f3 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-09-26 05:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/xhb/Makefile
+  + harbour/contrib/xhb/xhbwith.c
+    + added HB_QWith( [<nLevel>] ), HB_QWithObjectCounter(),  HB_QResetWith()
+
 2007-09-26 02:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbclass.ch
     + added:
diff --git a/harbour/contrib/xhb/Makefile b/harbour/contrib/xhb/Makefile
index 3207b28d06..0f9ba1ef86 100644
--- a/harbour/contrib/xhb/Makefile
+++ b/harbour/contrib/xhb/Makefile
@@ -11,6 +11,7 @@ C_SOURCES=\
 	cstructc.c \
 	xhbfunc.c  \
 	xhbmsgs.c  \
+	xhbwith.c  \
 
 PRG_SOURCES=\
 	txml.prg     \
diff --git a/harbour/contrib/xhb/xhbwith.c b/harbour/contrib/xhb/xhbwith.c
new file mode 100644
index 0000000000..8e36a1c8f8
--- /dev/null
+++ b/harbour/contrib/xhb/xhbwith.c
@@ -0,0 +1,111 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ *    xHarbour compatible WITH OBJECT internal functions
+ *
+ * Copyright 2007 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
+ * 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.
+ *
+ */
+
+#include "hbvmopt.h"
+#include "hbapi.h"
+#include "hbapiitm.h"
+#include "hbapierr.h"
+#include "hbstack.h"
+
+static PHB_ITEM hb_vmWithObjectItem( LONG lLevel )
+{
+   LONG lOffset = hb_stackWithObjectOffset();
+
+   while( lOffset && lLevel > 0 )
+   {
+      LONG * plOffset = ( LONG * ) hb_itemGetPtr( hb_stackItem( lOffset + 1 ) );
+      if( !plOffset )
+         break;
+      --lLevel;
+      lOffset = *plOffset;
+   }
+
+   return ( lOffset && !lLevel ) ? hb_stackItem( lOffset ) : NULL;
+}
+
+static LONG hb_vmWithObjectCount( void )
+{
+   LONG lOffset = hb_stackWithObjectOffset(), lCount = 0;
+
+   while( lOffset )
+   {
+      LONG * plOffset = ( LONG * ) hb_itemGetPtr( hb_stackItem( lOffset + 1 ) );
+      if( !plOffset )
+         break;
+      ++lCount;
+      lOffset = *plOffset;
+   }
+
+   return lCount;
+}
+
+
+
+HB_FUNC( HB_QWITH )
+{
+   hb_itemReturn( hb_vmWithObjectItem( hb_parnl( 1 ) ) );
+}
+
+HB_FUNC( HB_WITHOBJECTCOUNTER )
+{
+   hb_retnl( hb_vmWithObjectCount() );
+}
+
+HB_FUNC( HB_RESETWITH )
+{
+   PHB_ITEM pItem = hb_vmWithObjectItem( 0 );
+
+   if( hb_pcount() >= 1 && pItem )
+      hb_itemMove( pItem, hb_stackItemFromBase( 1 ) );
+   else
+      hb_errRT_BASE( EG_ARG, 1607, NULL, "HB_RESETWITH", 0, NULL );
+}