diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8852379d3..b9dcababcd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1935,13 +1935,14 @@ set(INSTALL_FILES
 	resources/share/wireshark/colorfilters
 	resources/share/wireshark/dfilter_macros
 	resources/share/wireshark/dfilters
-	resources/share/wireshark/pdml2html.xsl
 	resources/share/wireshark/smi_modules
 	services
 	wka
 )
 set(DOC_FILES
 	resources/share/doc/wireshark/ipmap.html
+	resources/share/doc/wireshark/pdml2html.xsl
+	doc/README.xml-output
 )
 
 if (BUILD_logray)
@@ -3800,6 +3801,13 @@ install(
 		${CMAKE_INSTALL_DATADIR}
 )
 
+install(
+	FILES
+		${DOC_FILES}
+	DESTINATION
+		${CMAKE_INSTALL_DOCDIR}
+)
+
 set(SHARK_PUBLIC_HEADERS
 	cfile.h
 	cli_main.h
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 88ea9a2982..f18bc727c7 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -133,10 +133,6 @@ if(ASCIIDOCTOR_FOUND)
 	)
 endif()
 
-list(APPEND HTML_INSTALL_FILES
-	${CMAKE_SOURCE_DIR}/resources/share/doc/wireshark/ipmap.html
-)
-
 install(
 	FILES
 		${HTML_INSTALL_FILES}
diff --git a/epan/print.c b/epan/print.c
index 686388fa2f..bd57e617b5 100644
--- a/epan/print.c
+++ b/epan/print.c
@@ -251,6 +251,7 @@ proto_tree_print_node(proto_node *node, gpointer data)
 }
 
 #define PDML2HTML_XSL "pdml2html.xsl"
+#define PDML2HTML_URL "https://gitlab.com/wireshark/wireshark/-/tree/master/resources/share/doc/wireshark/"
 void
 write_pdml_preamble(FILE *fh, const gchar *filename)
 {
@@ -270,7 +271,7 @@ write_pdml_preamble(FILE *fh, const gchar *filename)
 
     fprintf(fh, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
     fprintf(fh, "<?xml-stylesheet type=\"text/xsl\" href=\"" PDML2HTML_XSL "\"?>\n");
-    fprintf(fh, "<!-- You can find " PDML2HTML_XSL " in %s or at https://gitlab.com/wireshark/wireshark/-/raw/master/" PDML2HTML_XSL ". -->\n", get_datafile_dir());
+    fprintf(fh, "<!-- You can find " PDML2HTML_XSL " in %s or at "PDML2HTML_URL PDML2HTML_XSL ". -->\n", get_doc_dir());
     fprintf(fh, "<pdml version=\"" PDML_VERSION "\" creator=\"%s/%s\" time=\"%s\" capture_file=\"", PACKAGE, VERSION, ts);
     if (filename) {
         /* \todo filename should be converted to UTF-8. */
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index 2bec7461e3..5ab9d96648 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -472,12 +472,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README.md
-%doc %{_datadir}/doc/wireshark/*.html
-
-# Include the User Guide:
-%if %{with guides}
 %docdir %{_datadir}/doc/wireshark/
-%endif
 
 # Don't pick up any of the wireshark (GUI) binaries here
 %exclude %{_bindir}/wireshark*
diff --git a/resources/share/wireshark/pdml2html.xsl b/resources/share/doc/wireshark/pdml2html.xsl
similarity index 100%
rename from resources/share/wireshark/pdml2html.xsl
rename to resources/share/doc/wireshark/pdml2html.xsl