diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 637dd89a71..08a051aa47 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-10 08:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbrun/hbrun.prg
+    * Upped history length to 500 (from 128)
+
+  * contrib/make.hbs
+    * Skip hbppo projects.
+    * Minor internal mods.
+
+  * contrib/hbqt/hbqt_common.hbm
+    ! Fixed hbmk2 plugin name.
+
 2010-07-09 18:35 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/doc/en/class_hbqplaintextedit.txt
   * contrib/hbqt/hbqt_hbqplaintextedit.cpp
@@ -28,8 +39,8 @@
   * contrib/hbide/ideeditor.prg
   * contrib/hbide/idefunctions.prg
   * contrib/hbide/ideharbourhelp.prg
-    + Implemented: completely reworked code completion basics 
-      and brand new function prototype display as tooltip 
+    + Implemented: completely reworked code completion basics
+      and brand new function prototype display as tooltip
       ( now entirely native widget with many extras ).
 
 2010-07-09 22:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index 58af226298..3de49bd3d7 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -8,7 +8,7 @@
 
 -stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}
 
--plugin=hbmk2_plugin_qt.prg
+-plugin=hbmk2_plugin_qt.hbs
 
 -depkeyhead=qt:QtCore/qglobal.h
 -depcontrol=qt:${HB_WITH_QT}
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index ca621c735e..aa28fa4dde 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -170,7 +170,7 @@ PROCEDURE StandAlone( ... )
          EXIT
       ENDSWITCH
 
-      IF cType == "hrb"
+      IF cType $ "hbhrb|hbppo"
         LOOP
       ENDIF
 
@@ -439,8 +439,6 @@ PROCEDURE GNUMake( ... )
 
          IF ! Empty( cProject )
 
-            cType := get_hbmk2_project_type( s_cBase + cProject )
-
             cProject := StrTran( cProject, "\", "/" )
 
             IF ( tmp := At( "/", cProject ) ) > 0
@@ -457,6 +455,8 @@ PROCEDURE GNUMake( ... )
                cOptionsPre := cBaseOptions
                cOptionsPost := ""
 
+               cType := get_hbmk2_project_type( s_cBase + cProject )
+
                SWITCH cType
                CASE "hblib"
                CASE "hbimplib"
@@ -476,7 +476,7 @@ PROCEDURE GNUMake( ... )
                   EXIT
                ENDSWITCH
 
-               IF cType == "hrb"
+               IF cType $ "hbhrb|hbppo"
                   LOOP
                ENDIF
 
@@ -600,12 +600,12 @@ STATIC FUNCTION mk_hb_processRun( cCommand )
    RETURN iif( s_lTest, 0, hb_processRun( cCommand ) )
 
 STATIC FUNCTION get_hbmk2_project_type( cFileName )
-   LOCAL cFile := MemoRead( cFileName )
+   LOCAL cFile := MemoRead( PathSepToSelf( cFileName ) )
 
    IF     "-hblib"    $ cFile ; RETURN "hblib"
    ELSEIF "-hbimplib" $ cFile ; RETURN "hbimplib"
    ELSEIF "-hbdyn"    $ cFile ; RETURN "hbdyn"
-   ELSEIF "-gh"       $ cFile ; RETURN "hrb"
+   ELSEIF "-gh"       $ cFile ; RETURN "hbhrb"
    ENDIF
 
    RETURN "hbexe"
diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg
index 1e10957f61..f629db8c1b 100644
--- a/harbour/utils/hbrun/hbrun.prg
+++ b/harbour/utils/hbrun/hbrun.prg
@@ -70,7 +70,7 @@ REQUEST HB_GT_CGI
 REQUEST HB_GT_PCA
 REQUEST HB_GT_STD
 
-#define HB_HISTORY_LEN 128
+#define HB_HISTORY_LEN 500
 #define HB_LINE_LEN    256
 #define HB_PROMPT      "."