diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 39b3020b33..8dc8260b9c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,22 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-16 22:16 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  + contrib/hbrun/hbrun.rc
+    + Missed from prev commit.
+    ! Enable mft/ver features only for msvc, bcc and mingw, the
+      rest will die various deaths.
+
+  * package/harb_win.rc
+    * Tweak a little to not cause most RC to die.
+
+  * contrib/hbnetio/utils/hbnetio/hbnetio.hbp
+  * contrib/hbrun/hbrun.hbp
+    * Enabled security options only on win platform.
+
+  * contrib/hbrun/hbrun.hbp
+    + Added msvcarm option to avoid fatal compiler error in headers.c.
+
 2011-02-16 21:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   + package/harb_win.rc
   + package/harb_win.mft
diff --git a/harbour/contrib/hbnetio/utils/hbnetio/hbnetio.hbp b/harbour/contrib/hbnetio/utils/hbnetio/hbnetio.hbp
index 0d70468c6e..382c6e7dca 100644
--- a/harbour/contrib/hbnetio/utils/hbnetio/hbnetio.hbp
+++ b/harbour/contrib/hbnetio/utils/hbnetio/hbnetio.hbp
@@ -13,8 +13,8 @@ netiosrv.prg
 netiocon.prg
 netioeng.prg
 
--ldflag={allmsvc}-nxcompat
--ldflag={allmsvc}-dynamicbase
--ldflag={allmsvc}-fixed:no
+-ldflag={win&allmsvc}-nxcompat
+-ldflag={win&allmsvc}-dynamicbase
+-ldflag={win&allmsvc}-fixed:no
 
 #-prgflag=-DHB_EXTERN
diff --git a/harbour/contrib/hbrun/hbrun.hbp b/harbour/contrib/hbrun/hbrun.hbp
index d0f12bd5e9..e85535326c 100644
--- a/harbour/contrib/hbrun/hbrun.hbp
+++ b/harbour/contrib/hbrun/hbrun.hbp
@@ -11,9 +11,11 @@
 
 -head=dep
 
--ldflag={allmsvc}-nxcompat
--ldflag={allmsvc}-dynamicbase
--ldflag={allmsvc}-fixed:no
+-ldflag={win&allmsvc}-nxcompat
+-ldflag={win&allmsvc}-dynamicbase
+-ldflag={win&allmsvc}-fixed:no
+
+-cflag=-Zm200{wce&allmsvc}
 
 # required by some plugins (f.e. netio management console)
 -mt
diff --git a/harbour/contrib/hbrun/hbrun.rc b/harbour/contrib/hbrun/hbrun.rc
new file mode 100644
index 0000000000..61bf1cb7ee
--- /dev/null
+++ b/harbour/contrib/hbrun/hbrun.rc
@@ -0,0 +1,13 @@
+/*
+ * $Id$
+ */
+
+#if defined( OS2 ) || defined( __OS2__ ) || defined( OS_2 )
+ICON 1 DISCARDABLE "../../package/harb_os2.ico"
+#else
+1 ICON DISCARDABLE "../../package/harb_win.ico"
+#if defined( __MINGW32__ ) || defined( __BORLANDC__ ) || defined( _MSC_VER )
+#include "../../package/harb_win.rc"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "../../package/harb_win.mft"
+#endif
+#endif
diff --git a/harbour/package/harb_win.rc b/harbour/package/harb_win.rc
index cc359557c7..4d89a8b382 100644
--- a/harbour/package/harb_win.rc
+++ b/harbour/package/harb_win.rc
@@ -8,9 +8,11 @@
    ---------------------------------------------------------------
  */
 
-#include "hbapi.h"
 #include "hbver.h"
 
+#define HB_MACRO2STRING( macro )       HB_MACRO2STRING_( macro )
+#define HB_MACRO2STRING_( macro )      #macro
+
 #define HB_VER_PRODUCTVERSION          HB_VER_MAJOR,HB_VER_MINOR,HB_VER_RELEASE,0
 #define HB_VER_PRODUCTVERSION_STR      HB_MACRO2STRING( HB_VER_MAJOR ) "." HB_MACRO2STRING( HB_VER_MINOR ) "." HB_MACRO2STRING( HB_VER_RELEASE ) HB_VER_STATUS "\0"
 #define HB_VER_FILEVERSION             HB_VER_PRODUCTVERSION