diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bcc06916df..39b3020b33 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-16 21:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  + package/harb_win.rc
+  + package/harb_win.mft
+  * contrib/hbrun/hbrun.hbp
+    + Stirring the sh*t-bucket of nice Windows features!
+      Added extremely useful manifest file and versioninfo,
+      currently used with hbrun.
+      Let's see how different win/wce builds fall apart!
+      (note: if there will be too much problem, I'll just
+      delete it, as it most pbly isn't worth the extra
+      work required for maintaining these files)
+
 2011-02-16 13:17 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/rddads/ads.ch
     + Added TOFIX regarding COMMIT cmd.
diff --git a/harbour/contrib/hbrun/hbrun.hbp b/harbour/contrib/hbrun/hbrun.hbp
index 3229f3496b..d0f12bd5e9 100644
--- a/harbour/contrib/hbrun/hbrun.hbp
+++ b/harbour/contrib/hbrun/hbrun.hbp
@@ -15,7 +15,7 @@
 -ldflag={allmsvc}-dynamicbase
 -ldflag={allmsvc}-fixed:no
 
-# not required, for convenience only
+# required by some plugins (f.e. netio management console)
 -mt
 
 hbrun.prg
@@ -29,8 +29,11 @@ pullext.prg
 -lhbpp
 -lhbcommon
 
--icon={allwin}../../package/harb_win.ico
--icon={os2}../../package/harb_os2.ico
+# not using these together with .rc input, because some compilers (mingw)
+# do not support multiple .rc inputs
+#-icon={allwin}../../package/harb_win.ico
+#-icon={os2}../../package/harb_os2.ico
+hbrun.rc
 
 # Plugins
 
diff --git a/harbour/package/harb_win.mft b/harbour/package/harb_win.mft
new file mode 100644
index 0000000000..d4eeee95e4
--- /dev/null
+++ b/harbour/package/harb_win.mft
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright © 1999-2011 (see application banner) -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="2.1.0.0"
+     processorArchitecture="*"
+     name="Harbour Project"
+     type="win32"/>
+  <!-- Identify the application security requirements. -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/harbour/package/harb_win.rc b/harbour/package/harb_win.rc
new file mode 100644
index 0000000000..cc359557c7
--- /dev/null
+++ b/harbour/package/harb_win.rc
@@ -0,0 +1,65 @@
+/*
+ * $Id$
+ */
+
+/* ---------------------------------------------------------------
+   Copyright 2011 Viktor Szakats (harbour.01 syenar.hu)
+   See COPYING for licensing terms.
+   ---------------------------------------------------------------
+ */
+
+#include "hbapi.h"
+#include "hbver.h"
+
+#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
+#define HB_VER_FILEVERSION_STR         HB_VER_PRODUCTVERSION_STR
+
+#define HB_NAME                        "Harbour Project\0"
+#define HB_COPYRIGHT                   "Copyright \xA9 1999-2011 (see application banner)\0"
+
+/* Version info */
+
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION    HB_VER_FILEVERSION
+PRODUCTVERSION HB_VER_PRODUCTVERSION
+FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
+FILEFLAGS      0
+FILEOS         VOS__WINDOWS32
+FILETYPE       VFT_APP
+BEGIN
+   BLOCK "StringFileInfo"
+   BEGIN
+      /* LANGUAGE: US English ENCODING: Windows-1250 (0x04E2) */
+      BLOCK "040904B0"
+      BEGIN
+         VALUE "Comments",         "See COPYING for licensing terms.\0"
+         VALUE "CompanyName",      HB_NAME
+         VALUE "FileDescription",  HB_NAME
+         VALUE "FileVersion",      HB_VER_FILEVERSION_STR
+         VALUE "LegalCopyright",   HB_COPYRIGHT
+         VALUE "ProductName",      HB_NAME
+         VALUE "ProductVersion",   HB_VER_PRODUCTVERSION_STR
+      END
+   END
+
+   BLOCK "VarFileInfo"
+   BEGIN
+      /* LANGUAGE: US English ENCODING: UNICODE (0x4B0) */
+      VALUE "Translation", 0x409, 0x4B0
+   END
+END
+
+/* Preparation for manifest */
+
+#include <winuser.h>
+
+#ifndef RT_MANIFEST
+#define RT_MANIFEST 24
+#endif
+#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+#endif