diff --git a/reactos/boot/bootdata/hivecls_arm.inf b/reactos/boot/bootdata/hivecls_arm.inf
index e339eb96ca8..ac63580e188 100644
--- a/reactos/boot/bootdata/hivecls_arm.inf
+++ b/reactos/boot/bootdata/hivecls_arm.inf
@@ -117,8 +117,15 @@ HKCR,"ttffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.
 ; Help Files
 HKCR,".hlp","",0x00000000,"hlpfile"
 HKCR,"hlpfile","",0x00000000,"Help File"
-HKCR,"fonfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168"
+HKCR,"hlpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168"
 HKCR,"hlpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-24"
+HKCR,"hlpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\winhlp32.exe %1"
+
+HKCR,".chm","",0x00000000,"chm.file"
+HKCR,"chm.file","",0x00000000,"Help File"
+HKCR,"chm.file","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168"
+HKCR,"chm.file\DefaultIcon","",0x00020000,"%SystemRoot%\hh.exe,0"
+HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe %1"
 
 ; set MIME type for .html and .htm because Tiny webserver needs it
 HKCR,".htm","",0x00000000,"html"
diff --git a/reactos/boot/bootdata/hivecls_i386.inf b/reactos/boot/bootdata/hivecls_i386.inf
index bdbbb962a7f..bd2cc7998b8 100644
--- a/reactos/boot/bootdata/hivecls_i386.inf
+++ b/reactos/boot/bootdata/hivecls_i386.inf
@@ -117,8 +117,15 @@ HKCR,"ttffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.
 ; Help Files
 HKCR,".hlp","",0x00000000,"hlpfile"
 HKCR,"hlpfile","",0x00000000,"Help File"
-HKCR,"fonfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168"
+HKCR,"hlpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168"
 HKCR,"hlpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-24"
+HKCR,"hlpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\winhlp32.exe %1"
+
+HKCR,".chm","",0x00000000,"chm.file"
+HKCR,"chm.file","",0x00000000,"Help File"
+HKCR,"chm.file","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168"
+HKCR,"chm.file\DefaultIcon","",0x00020000,"%SystemRoot%\hh.exe,0"
+HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe %1"
 
 ; set MIME type for .html and .htm because Tiny webserver needs it
 HKCR,".htm","",0x00000000,"html"
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index a39bc24606e..f7ea519237a 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -44,7 +44,7 @@ base\applications\mscutils\devmgmt\devmgmt.exe          1
 base\applications\mscutils\eventvwr\eventvwr.exe        1
 base\applications\games\solitaire\sol.exe               1
 base\applications\games\winemine\winemine.exe           1
-base\applications\hh\hh.exe                             1
+base\applications\hh\hh.exe                             4
 base\applications\kbswitch\kbswitch.exe                 1
 base\applications\kbswitch\kbsdll\kbsdll.dll            1
 base\applications\logoff\logoff.exe                     1