diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 02ca686bb1..80aae9a56a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-09 02:27 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbplist
+  - contrib/hbrun/hbrunext.hbp
+  + contrib/hbrun/hbrun.prg
+  + contrib/hbrun/hbrun.hbp
+  + contrib/hbrun/hbrun.1
+  * config/postinst.hbs
+  - utils/hbrun
+  * utils/Makefile
+    * Moved hbrun to contrib area.
+    ; Now it can contain any contrib libs.
+
 2011-02-09 02:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * contrib/hbplist
    - contrib/hbrunext
diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs
index 673db90e3a..9561c9b2a4 100644
--- a/harbour/config/postinst.hbs
+++ b/harbour/config/postinst.hbs
@@ -124,8 +124,8 @@ PROCEDURE Main( ... )
             FOR EACH tmp IN { "src/main/harbour.1"    ,;
                               "src/pp/hbpp.1"         ,;
                               "utils/hbmk2/hbmk2.1"   ,;
-                              "utils/hbrun/hbrun.1"   ,;
-                              "utils/hbtest/hbtest.1" }
+                              "utils/hbtest/hbtest.1" ,;
+                              "contrib/hbrun/hbrun.1" }
                mk_hb_FCopy( tmp, GetEnvC( "HB_INSTALL_MAN" ) + hb_ps() + "man1" + hb_ps(), .T. )
             NEXT
          ELSE
diff --git a/harbour/contrib/hbplist b/harbour/contrib/hbplist
index c09daa1aac..441d954c88 100644
--- a/harbour/contrib/hbplist
+++ b/harbour/contrib/hbplist
@@ -39,7 +39,7 @@ hbnf/hbnf.hbp
 hbodbc/hbodbc.hbp
 hbpgsql/hbpgsql.hbp
 hbqt/hbqt_all.hbp
-hbrun/hbrunext.hbp
+hbrun/hbrun.hbp
 hbsms/hbsms.hbp
 hbsqlit3/hbsqlit3.hbp            # uses: sqlite3 (locally hosted)
 hbssl/hbssl.hbp
diff --git a/harbour/utils/hbrun/hbrun.1 b/harbour/contrib/hbrun/hbrun.1
similarity index 100%
rename from harbour/utils/hbrun/hbrun.1
rename to harbour/contrib/hbrun/hbrun.1
diff --git a/harbour/contrib/hbrun/hbrunext.hbp b/harbour/contrib/hbrun/hbrun.hbp
similarity index 54%
rename from harbour/contrib/hbrun/hbrunext.hbp
rename to harbour/contrib/hbrun/hbrun.hbp
index 5a84fb3521..6e873eecd7 100644
--- a/harbour/contrib/hbrun/hbrunext.hbp
+++ b/harbour/contrib/hbrun/hbrun.hbp
@@ -2,18 +2,29 @@
 # $Id$
 #
 
--inc
+-w3 -es2 -l
+-kmo
 
-@../../utils/hbrun/hbrun.hbp
+-DHBRUN_WITH_HEADERS
 
--o${hb_name}
+-ldflag={allmsvc}-nxcompat
+-ldflag={allmsvc}-dynamicbase
+-ldflag={allmsvc}-fixed:no
+
+# not required, for convenience only
+-mt
+
+hbrun.prg
 
 -request=__hbrun_extensions
 pullext.prg
 
-# Always build in shared mode for these platforms because the
-# tool is included in std distro and we want to minimize its size.
-{_HB_BUILD_&(!(HB_BUILD_DYN='no')&(win|wce|os2))}-shared
+-lhbcplr
+-lhbpp
+-lhbcommon
+
+-icon={allwin}../../package/harb_win.ico
+-icon={os2}../../package/harb_os2.ico
 
 # Here comes the list of contribs linked in:
 # - Make sure to keep it in sync with pullext.prg.
diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/contrib/hbrun/hbrun.prg
similarity index 100%
rename from harbour/utils/hbrun/hbrun.prg
rename to harbour/contrib/hbrun/hbrun.prg
diff --git a/harbour/utils/Makefile b/harbour/utils/Makefile
index 40412d42e3..abe0042cc4 100644
--- a/harbour/utils/Makefile
+++ b/harbour/utils/Makefile
@@ -13,7 +13,6 @@ ifneq ($(HB_BUILD_PARTS),compiler)
 
    DIRS += \
       hbi18n \
-      hbrun \
       hbtest \
       $(__HB_UTIL_ADDONS)
 
diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile
deleted file mode 100644
index 8dbd1ec7bf..0000000000
--- a/harbour/utils/hbrun/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-include $(TOP)$(ROOT)config/global.mk
-
-PRG_SOURCES := \
-   hbrun.prg \
-
-RC_SOURCES := \
-   hbrun.rc
-
-PRG_MAIN := hbrun.prg
-
-LIBS = hbcplr hbpp hbcommon $(HB_LIBS_MT_RDD)
-
-HB_PRGFLAGS += -DHBRUN_WITH_HEADERS
-
-include $(TOP)$(ROOT)config/bin.mk
diff --git a/harbour/utils/hbrun/hbrun.hbp b/harbour/utils/hbrun/hbrun.hbp
deleted file mode 100644
index 505c8ad126..0000000000
--- a/harbour/utils/hbrun/hbrun.hbp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id$
-#
-
--q0 -w3 -es2 -kmo -l
-
--DHBRUN_WITH_HEADERS
-
--ldflag={allmsvc}-nxcompat
--ldflag={allmsvc}-dynamicbase
--ldflag={allmsvc}-fixed:no
-
-# not required, for convenience only
--mt
-
-hbrun.prg
-
--lhbcplr
--lhbpp
--lhbcommon
-
--icon={allwin}../../package/harb_win.ico
--icon={os2}../../package/harb_os2.ico
diff --git a/harbour/utils/hbrun/hbrun.rc b/harbour/utils/hbrun/hbrun.rc
deleted file mode 100644
index e23e7880bf..0000000000
--- a/harbour/utils/hbrun/hbrun.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * $Id$
- */
-
-#if defined( OS2 ) || defined( __OS2__ ) || defined( OS_2 )
-ICON 1 DISCARDABLE "../../../../../package/harb_os2.ico"
-#else
-1 ICON DISCARDABLE "../../../../../package/harb_win.ico"
-#endif