diff --git a/.gitignore b/.gitignore
index 9ef8f80df13..f516e529b5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,7 +90,7 @@ qt*-config.pri
 /bin/qglinfo
 /bin/qgltf
 /bin/qhelpconverter
-/bin/qhelpgenerator
+/libexec/qhelpgenerator
 /bin/qlalr
 /bin/qml
 /bin/qmleasing
diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
index a06d36f0ef8..ae8034318e0 100644
--- a/cmake/QtDocsHelpers.cmake
+++ b/cmake/QtDocsHelpers.cmake
@@ -46,7 +46,7 @@ function(qt_internal_add_docs)
 
     set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
     set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
-    set(qhelpgenerator_bin "${doc_tools_bin}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
+    set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
 
     get_target_property(target_type ${target} TYPE)
     if (NOT target_type STREQUAL "INTERFACE_LIBRARY")
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index b1a1e1ad928..2a079c90a91 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -47,7 +47,7 @@ isEmpty(QDOC_WIN_INCLUDETEMP) {
 
 macos: QDOC_INCLUDE_PATHS += $$join(QMAKE_DEFAULT_INCDIRS," -I","-I")
 
-!build_online_docs: qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
+!build_online_docs: qtPrepareLibExecTool(QHELPGENERATOR, qhelpgenerator)
 
 qtPrepareLibExecTool(QTATTRIBUTIONSSCANNER, qtattributionsscanner)