diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0b1d68fa15..7a8acf4e7a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-18 18:14 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  + harbour/contrib/hbfship/dbsetloc.c
+  * harbour/contrib/hbfship/hbfship.hbp
+    + added new FlagShip compatible function:
+         DBSETLOCATE[BLOCK]( <bFor> ) -> <lSet>
+
 2011-01-18 17:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hblzf/hblzf.c
     * Reformatted by uncrustify (nothing serious).
diff --git a/harbour/contrib/hbfship/dbsetloc.c b/harbour/contrib/hbfship/dbsetloc.c
new file mode 100644
index 0000000000..3344496bdb
--- /dev/null
+++ b/harbour/contrib/hbfship/dbsetloc.c
@@ -0,0 +1,80 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ *    DBSETLOCATE[BLOCK]( <bFor> ) -> <lSet>
+ * FlagShip compatible functions
+ *
+ * Copyright 2011 Przemyslaw Czerpak <druzus@acn.waw.pl>
+ * www - http://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 "hbapi.h"
+#include "hbapirdd.h"
+
+HB_FUNC( DBSETLOCATE )
+{
+   AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
+   HB_BOOL fSet = HB_FALSE;
+
+   if( pArea )
+   {
+      PHB_ITEM pLocate = hb_param( 1, HB_IT_BLOCK );
+      if( pLocate )
+      {
+         DBSCOPEINFO pScopeInfo;
+         memset( &pScopeInfo, 0, sizeof( pScopeInfo ) );
+         pScopeInfo.itmCobFor = pLocate;
+         fSet = SELF_SETLOCATE( pArea, &pScopeInfo ) == HB_SUCCESS;
+      }
+   }
+
+   hb_retl( fSet );
+}
+
+HB_FUNC( DBSETLOCATEBLOCK )
+{
+   HB_FUNC_EXEC( DBSETLOCATE )
+}
diff --git a/harbour/contrib/hbfship/hbfship.hbp b/harbour/contrib/hbfship/hbfship.hbp
index 6ba7bd68ca..d54fe03d63 100644
--- a/harbour/contrib/hbfship/hbfship.hbp
+++ b/harbour/contrib/hbfship/hbfship.hbp
@@ -12,6 +12,7 @@
 fldarr.prg
 isdb.prg
 
+dbsetloc.c
 exec.c
 flddeci.c
 index.c
@@ -19,3 +20,4 @@ isbegseq.c
 isfunc.c
 secondfs.c
 strpeek.c
+users.c