diff --git a/cmake/PugsDoc.cmake b/cmake/PugsDoc.cmake
index e6fe806ab4e3d0a2329281fb140902d49b70b659..0cd8a4c5829189d7d1b97173eb57e48035275f93 100644
--- a/cmake/PugsDoc.cmake
+++ b/cmake/PugsDoc.cmake
@@ -26,7 +26,7 @@ if (EMACS)
 
   add_custom_command(
     COMMENT "Check Emacs packages for documentation building"
-    OUTPUT "${PUGS_SOURCE_DIR}/doc/elpa"
+    OUTPUT "${PUGS_SOURCE_DIR}/doc/lisp/elpa"
     COMMAND
     ${CMAKE_COMMAND} -E env
     PUGS=${PUGS_BINARY_DIR}/pugs
@@ -37,7 +37,7 @@ if (EMACS)
     DEPENDS ${ORG_GENERATOR_FILES}
   )
 
-  add_custom_target(pugsdoc-download-elpa DEPENDS "${PUGS_SOURCE_DIR}/doc/elpa")
+  add_custom_target(pugsdoc-download-elpa DEPENDS "${PUGS_SOURCE_DIR}/doc/lisp/elpa")
 
   add_custom_command(
     OUTPUT "${PUGS_BINARY_DIR}/doc/userdoc.html"
@@ -48,7 +48,13 @@ if (EMACS)
     PUGS_SOURCE_DIR=${PUGS_SOURCE_DIR}
     PUGS_BINARY_DIR=${PUGS_BINARY_DIR}
     ${EMACS} -Q --script ${PUGS_SOURCE_DIR}/doc/lisp/userdoc-html.el
-    DEPENDS "${PUGS_SOURCE_DIR}/doc/userdoc.org" "${PUGS_SOURCE_DIR}/doc/lisp/userdoc-html.el" pugs pugsdoc-dir pugsdoc-download-elpa
+    DEPENDS
+    "${PUGS_SOURCE_DIR}/doc/userdoc.org"
+    "${PUGS_SOURCE_DIR}/doc/lisp/userdoc-html.el"
+    pugs
+    pugsdoc-dir
+    pugsdoc-download-elpa
+    ${ORG_GENERATOR_FILES}
     WORKING_DIRECTORY ${PUGS_BINARY_DIR}/doc
     COMMENT "Built user documentation in doc/userdoc.html"
     VERBATIM)
@@ -68,7 +74,13 @@ if (EMACS)
       PUGS_SOURCE_DIR=${PUGS_SOURCE_DIR}
       PUGS_BINARY_DIR=${PUGS_BINARY_DIR}
       ${EMACS} -Q --script ${PUGS_SOURCE_DIR}/doc/lisp/userdoc-pdf.el
-      DEPENDS "${PUGS_SOURCE_DIR}/doc/userdoc.org" "${PUGS_SOURCE_DIR}/doc/lisp/userdoc-pdf.el" pugs pugsdoc-dir pugsdoc-download-elpa
+      DEPENDS
+      "${PUGS_SOURCE_DIR}/doc/userdoc.org"
+      "${PUGS_SOURCE_DIR}/doc/lisp/userdoc-pdf.el"
+      pugs
+      pugsdoc-dir
+      pugsdoc-download-elpa
+      ${ORG_GENERATOR_FILES}
       WORKING_DIRECTORY ${PUGS_BINARY_DIR}/doc
       COMMENT "Built user documentation in doc/userdoc.pdf"
       VERBATIM)