diff --git a/Makefile b/Makefile
index f8930972..ec40f8b2 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ xca$(SUFFIX): $(OBJECTS)
 
 do.ui do.doc do.lang do.misc: do.%:
 	mkdir -p $*
-	$(MAKE) -C $* -f $(TOPDIR)/$*/Makefile VPATH=$(TOPDIR)/$* $*
+	$(MAKE) -C $* -f $(TOPDIR)/$*/Makefile VPATH=$(TOPDIR)/$* all
 
 headers: do.ui commithash.h
 
@@ -166,7 +166,7 @@ xca-portable-$(VERSION): xca$(SUFFIX).signed do.doc do.lang do.misc
 	   "$(INSTALL_DIR)/bin/libltdl-7.dll" \
 	   "$(INSTALL_DIR)/bin/libcrypto-1_1-x64.dll" \
 	   "$(TOPDIR)"/misc/*.xca "${TOPDIR}/../sql/"*.dll $@
-	cp -a doc/qthelp/* $@/html
+	cp -a doc/qthelp/*.html doc/qthelp/xca.qhc doc/qthelp/xca.qch $@/html
 	cp $(patsubst %,"$(QTDIR)/translations/qt_%.qm", de es pl pt ru fr sk it ja) \
 		lang/*.qm $@/i18n
 	sed 's/$$/\r/' < "$(TOPDIR)"/COPYRIGHT > $@/copyright.txt
diff --git a/misc/xca.wxs b/misc/xca.wxs
index 46c30602..7ac92eda 100644
--- a/misc/xca.wxs
+++ b/misc/xca.wxs
@@ -244,12 +244,6 @@
             <Component Id="Cxca.qhc" Guid="4e19aeb1-5c08-4242-9b4b-dccec72f325c">
                 <File Id="xca.qhc" Source="html/xca.qhc" KeyPath="yes"/>
             </Component>
-            <Component Id="Cxca.qhcp" Guid="47e53de5-3f5b-492c-a605-4c40e82bb339">
-                <File Id="xca.qhcp" Source="html/xca.qhcp" KeyPath="yes"/>
-            </Component>
-            <Component Id="Cxca.qhp" Guid="48e55359-da55-44d2-b54c-fd7a49094a73">
-                <File Id="xca.qhp" Source="html/xca.qhp" KeyPath="yes"/>
-            </Component>
         </DirectoryRef>
 
         <DirectoryRef Id="i18n">
@@ -414,8 +408,6 @@
             <ComponentRef Id="Ctemplate.html"/>
             <ComponentRef Id="Cxca.qch"/>
             <ComponentRef Id="Cxca.qhc"/>
-            <ComponentRef Id="Cxca.qhcp"/>
-            <ComponentRef Id="Cxca.qhp"/>
         </ComponentGroup>
 
         <ComponentGroup Id="GroupI18n">