diff --git a/reactos/base/applications/applications.rbuild b/reactos/base/applications/applications.rbuild
index 71c4efd561d..6aba925ccf1 100644
--- a/reactos/base/applications/applications.rbuild
+++ b/reactos/base/applications/applications.rbuild
@@ -73,6 +73,9 @@
 	<directory name="winhlp32">
 		<xi:include href="winhlp32/winhlp32.rbuild" />
 	</directory>
+	<directory name="winhstb">
+		<xi:include href="winhstb/winhstb.rbuild" />
+	</directory>
 	<directory name="wordpad">
 		<xi:include href="wordpad/wordpad.rbuild" />
 	</directory>
diff --git a/reactos/base/applications/winhlp32/winhlp32.rbuild b/reactos/base/applications/winhlp32/winhlp32.rbuild
index 4cfe04f2ddf..c76d847eb79 100644
--- a/reactos/base/applications/winhlp32/winhlp32.rbuild
+++ b/reactos/base/applications/winhlp32/winhlp32.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="winhlp32" type="win32gui" installbase="system32" installname="winhlp32.exe" allowwarnings="true" unicode="no">
+<module name="winhlp32" type="win32gui" installname="winhlp32.exe" allowwarnings="true" unicode="no">
 	<include base="winhlp32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__ROS_LONG64__" />
diff --git a/reactos/base/applications/winhstb/res/4000.ico b/reactos/base/applications/winhstb/res/4000.ico
new file mode 100644
index 00000000000..6008790389d
Binary files /dev/null and b/reactos/base/applications/winhstb/res/4000.ico differ
diff --git a/reactos/base/applications/winhstb/resource.h b/reactos/base/applications/winhstb/resource.h
new file mode 100644
index 00000000000..59eb06a7b7d
--- /dev/null
+++ b/reactos/base/applications/winhstb/resource.h
@@ -0,0 +1,2 @@
+/* Icons */
+#define IDI_MAIN 4000
diff --git a/reactos/base/applications/winhstb/winhstb.c b/reactos/base/applications/winhstb/winhstb.c
new file mode 100644
index 00000000000..91c669ab10c
--- /dev/null
+++ b/reactos/base/applications/winhstb/winhstb.c
@@ -0,0 +1,46 @@
+/*
+ * PROJECT:         winhlp32.exe
+ * FILE:            base\applications\winhlp32\winhstb\winhstb.c
+ * PURPOSE:         Stub winhelp32
+ * PROGRAMMERS:     Dmitry Chapyshev (dmitry@reactos.org)
+ */
+
+#include <windows.h>
+#include <tchar.h>
+#include <shellapi.h>
+#include <shlwapi.h>
+#include "resource.h"
+
+#define WINHLP  _T("winhlp32.exe")
+
+int
+WINAPI
+_tWinMain(HINSTANCE hCurInst,
+          HINSTANCE hPrevInst,
+          LPTSTR lpsCmdLine,
+          int nCmdShow)
+{
+    TCHAR szPath[MAX_PATH];
+
+    if(GetWindowsDirectory(szPath, MAX_PATH))
+    {
+        PathAppend(szPath, WINHLP);
+        ShellExecute(NULL,
+                     NULL,
+                     szPath,
+                     lpsCmdLine,
+                     NULL,
+                     nCmdShow);
+    }
+    else
+    {
+        ShellExecute(NULL,
+                     NULL,
+                     WINHLP,
+                     lpsCmdLine,
+                     NULL,
+                     nCmdShow);
+    }
+
+    return 0;
+}
diff --git a/reactos/base/applications/winhstb/winhstb.rbuild b/reactos/base/applications/winhstb/winhstb.rbuild
new file mode 100644
index 00000000000..b585e2458a0
--- /dev/null
+++ b/reactos/base/applications/winhstb/winhstb.rbuild
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="winhstb" type="win32gui" installbase="system32" installname="winhlp32.exe" unicode="no">
+	<include base="winhstb">.</include>
+	<library>user32</library>
+	<library>kernel32</library>
+	<library>shell32</library>
+	<library>shlwapi</library>
+	<file>winhstb.c</file>
+	<file>winhstb.rc</file>
+</module>
diff --git a/reactos/base/applications/winhstb/winhstb.rc b/reactos/base/applications/winhstb/winhstb.rc
new file mode 100644
index 00000000000..0205f4b8b67
--- /dev/null
+++ b/reactos/base/applications/winhstb/winhstb.rc
@@ -0,0 +1,11 @@
+#include "resource.h"
+#include <windows.h>
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS WinHlp32 Stub\0"
+#define REACTOS_STR_INTERNAL_NAME	"winhstb\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"winhlp32.exe\0"
+#include <reactos/version.rc>
+
+IDI_MAIN ICON "res/4000.ico"
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index e5d6358c066..2e03adb8319 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -74,7 +74,8 @@ base\applications\mscutils\servman\servman.exe          1
 base\applications\shutdown\shutdown.exe                 1
 base\applications\sndvol32\sndvol32.exe                 1
 base\applications\taskmgr\taskmgr.exe                   1
-base\applications\winhlp32\winhlp32.exe                 1
+base\applications\winhlp32\winhlp32.exe                 4
+base\applications\winhstb\winhlp32.exe                  1
 base\applications\wordpad\wordpad.exe                   1
 
 base\services\audiosrv\audiosrv.exe                 1