diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2f7bf45e5e..750f6919cb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-03-11 13:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbrun/hbrun.prg
+    ! Fixed to not crash due to corrupted .hrb leftover files next to hbrun executable.
+
+  * src/compiler/hbusage.c
+    ! typo in e-mail address
+  * contrib/hbqt/hbqt_common.hbm
+    + qt autodetection on beos
+  * config/postinst.hbs
+    * ld config -> linux only
+  ; [Tamas Tevesz]
+
 2011-03-11 09:42 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/hbrandom.c
     ! fixed double number calculation for random values by removing
@@ -33,7 +45,7 @@
 
 2011-03-10 17:53 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/hbmk2_qt.hbs
-    ! Optimized: methods callable with no arguments. 
+    ! Optimized: methods callable with no arguments.
 
 2011-03-11 01:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbmk2_qt.hbs
diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs
index 4d983eea76..74c6237341 100644
--- a/harbour/config/postinst.hbs
+++ b/harbour/config/postinst.hbs
@@ -98,9 +98,10 @@ PROCEDURE Main( ... )
             OutStd( hb_StrFormat( "! Error: Cannot create directory '%1$s'", GetEnvC( "HB_INSTALL_ETC" ) ) + hb_eol() )
          ENDIF
 
+#if defined( __PLATFORM__LINUX )
          IF ! Empty( GetEnvC( "HB_INSTALL_DYN" ) )
 
-            OutStd( "! Creating *nix ld config file..." + hb_eol() )
+            OutStd( "! Creating Linux ld config file..." + hb_eol() )
 
             tmp := GetEnvC( "HB_INSTALL_ETC" ) + hb_ps() + ".." + hb_ps() + "ld.so.conf.d"
             IF hb_DirBuild( PathSepToSelf( tmp ) )
@@ -113,6 +114,7 @@ PROCEDURE Main( ... )
                OutStd( hb_StrFormat( "! Error: Cannot create directory '%1$s'", tmp ) + hb_eol() )
             ENDIF
          ENDIF
+#endif
       ENDIF
 
       IF ! Empty( GetEnvC( "HB_INSTALL_MAN" ) )
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index 95a8abf754..f32752fe28 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -33,3 +33,4 @@
 {bsd}-depincpath=qt:/usr/local/include/qt4
 {darwin}-depincpath=qt:/Developer/qt/include
 {darwin}-depincpath=qt:/Library/Frameworks
+{beos}-depincpath=qt:/boot/common/include
diff --git a/harbour/contrib/hbrun/hbrun.prg b/harbour/contrib/hbrun/hbrun.prg
index 3ba5ac9733..712b47253d 100644
--- a/harbour/contrib/hbrun/hbrun.prg
+++ b/harbour/contrib/hbrun/hbrun.prg
@@ -255,10 +255,14 @@ STATIC FUNCTION plugins_load( hPlugins, aParams )
             EXIT
          ENDIF
       CASE ".hrb"
-         plugin[ _PLUGIN_hHRB ] := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
-         IF Empty( hHRBEntry := hb_hrbGetFunSym( plugin[ _PLUGIN_hHRB ], "__hbrun_plugin" ) )
+         BEGIN SEQUENCE WITH {| oErr | Break( oErr ) }
+            plugin[ _PLUGIN_hHRB ] := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
+            IF Empty( hHRBEntry := hb_hrbGetFunSym( plugin[ _PLUGIN_hHRB ], "__hbrun_plugin" ) )
+               plugin[ _PLUGIN_hHRB ] := NIL
+            ENDIF
+         RECOVER
             plugin[ _PLUGIN_hHRB ] := NIL
-         ENDIF
+         END SEQUENCE
          EXIT
       ENDSWITCH
 
diff --git a/harbour/src/compiler/hbusage.c b/harbour/src/compiler/hbusage.c
index 5bc43cea8b..184972eced 100644
--- a/harbour/src/compiler/hbusage.c
+++ b/harbour/src/compiler/hbusage.c
@@ -254,7 +254,7 @@ void hb_compPrintCredits( HB_COMP_DECL )
          "Ross Presser (ross_presser imtek.com)\n"
          "Ryszard Glab (rglab imid.med.pl)\n"
          "Tamas Tevesz (ice extreme.hu)\n"
-         "Teo Fonrouge (teo windtelsoft.dot.com)\n"
+         "Teo Fonrouge (teo windtelsoft.com)\n"
          "Tim Stone (timstone mstrlink.com)\n"
          "Tomaz Zupan (tomaz.zupan orpo.si)\n"
          "Vailton Renato (vailtom gmail.com)\n"