diff --git a/Makefile b/Makefile
index 717cf2f68d..ec7f5c7bce 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ else
 endif
 
 helptags: | nvim
-	+$(BUILD_CMD) -C build helptags
+	+$(BUILD_CMD) -C build runtime/doc/tags
 
 # Builds help HTML _and_ checks for invalid help tags.
 helphtml: | nvim helptags
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index f3bfd786ad..d66e04f5f2 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -78,7 +78,7 @@ add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
 add_custom_target(doc_html
   COMMAND make html
   DEPENDS
-    helptags
+    ${GENERATED_HELP_TAGS}
   WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}/doc"
 )