diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eec3129d8a..51ee43ca2b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -487,10 +487,10 @@ Documentation:
       - wsug_html_chunked.zip
       - wsdg_html.zip
       - wsdg_html_chunked.zip
-      - "Wireshark User’s Guide.pdf"
-      - "Wireshark Developer’s Guide.pdf"
-      - "Wireshark User’s Guide.epub"
-      - "Wireshark Developer’s Guide.epub"
+      - "Wireshark User's Guide.pdf"
+      - "Wireshark Developer's Guide.pdf"
+      - "Wireshark User's Guide.epub"
+      - "Wireshark Developer's Guide.epub"
   needs: []
 
 
diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake
index 6b43271537..0f017c1cb7 100644
--- a/cmake/modules/FindAsciidoctor.cmake
+++ b/cmake/modules/FindAsciidoctor.cmake
@@ -26,7 +26,7 @@ FIND_PROGRAM(ASCIIDOCTOR_EXECUTABLE
 if(ASCIIDOCTOR_EXECUTABLE)
     # As of 2.2.0 the AsciidctorJ wrapper script sets -Xmn128m -Xms256m -Xmx256m.
     # This isn't enough for the User's Guide.
-    set(_asciidoctorj_opts -Xmn256m -Xms512m -Xmx2048m $ENV{ASCIIDOCTORJ_OPTS})
+    set(_asciidoctorj_opts "-Xmn256m -Xms512m -Xmx2048m $ENV{ASCIIDOCTORJ_OPTS}")
     execute_process( COMMAND ${ASCIIDOCTOR_EXECUTABLE} --version OUTPUT_VARIABLE _ad_full_version )
     separate_arguments(_ad_full_version)
     list(GET _ad_full_version 1 ASCIIDOCTOR_VERSION)
@@ -50,7 +50,7 @@ if(ASCIIDOCTOR_EXECUTABLE)
     )
 
     set(_asciidoctor_common_command
-        ${CMAKE_COMMAND} -E env TZ=UTC ASCIIDOCTORJ_OPTS="${_asciidoctorj_opts}"
+        ${CMAKE_COMMAND} -E env TZ=UTC ASCIIDOCTORJ_OPTS=${_asciidoctorj_opts}
         ${ASCIIDOCTOR_EXECUTABLE}
         ${_asciidoctor_common_args}
     )
@@ -144,7 +144,7 @@ if(ASCIIDOCTOR_EXECUTABLE)
     if(ASCIIDOCTOR_PDF_EXECUTABLE)
 
         set(_asciidoctor_pdf_common_command
-            ${CMAKE_COMMAND} -E env TZ=UTC ASCIIDOCTORJ_OPTS="${_asciidoctorj_opts}"
+            ${CMAKE_COMMAND} -E env TZ=UTC "ASCIIDOCTORJ_OPTS=${_asciidoctorj_opts}"
             ${ASCIIDOCTOR_PDF_EXECUTABLE}
             --require asciidoctor-pdf
             --backend pdf
@@ -160,12 +160,12 @@ if(ASCIIDOCTOR_EXECUTABLE)
             OUTPUT
                     ${_output_pdf}
             COMMAND ${_asciidoctor_pdf_common_command}
-                    --out-file ${_output_pdf}
+                    --out-file "${_output_pdf}"
                     ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource}
             DEPENDS
                     ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource}
                     ${ARGN}
-
+            VERBATIM
             )
             add_custom_target(${_generate_pdf} DEPENDS ${_output_pdf})
             set_asciidoctor_target_properties(${_generate_pdf})
@@ -210,11 +210,12 @@ if(ASCIIDOCTOR_EXECUTABLE)
             OUTPUT
                     ${_output_epub}
             COMMAND ${_asciidoctor_epub_common_command}
-                    --out-file ${_output_epub}
+                    --out-file "${_output_epub}"
                     ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource}
             DEPENDS
                     ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource}
                     ${ARGN}
+            VERBATIM
             )
             add_custom_target(${_generate_epub} DEPENDS ${_output_epub})
             set_asciidoctor_target_properties(${_generate_epub})
diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index 9640c1ea01..3ef8827717 100644
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -43,7 +43,7 @@ add_custom_target(update_tools_help
 )
 set_docbook_target_properties(update_tools_help)
 
-set(WSUG_TITLE "Wireshark User’s Guide")
+set(WSUG_TITLE "Wireshark User's Guide")
 
 set(WSUG_FILES
 	wsug_src/WSUG_app_files.adoc
@@ -223,7 +223,7 @@ set(WSUG_GRAPHICS
 	${COMMON_GRAPHICS}
 )
 
-set(WSDG_TITLE "Wireshark Developer’s Guide")
+set(WSDG_TITLE "Wireshark Developer's Guide")
 
 set(WSDG_FILES
 	wsdg_src/WSDG_chapter_asn2wrs.adoc