diff --git a/doc/ja/manual/meson.build b/doc/ja/manual/meson.build
index 05c38385ad..f3176a8714 100644
--- a/doc/ja/manual/meson.build
+++ b/doc/ja/manual/meson.build
@@ -98,5 +98,5 @@ custom_target(
         '@INPUT@',
     ],
     install: true,
-    install_dir: datadir / 'doc/netatalk/htmldocs/ja',
+    install_dir: manual_install_path / 'ja',
 )
diff --git a/doc/manual/meson.build b/doc/manual/meson.build
index f0fabaf557..70f342fcb4 100644
--- a/doc/manual/meson.build
+++ b/doc/manual/meson.build
@@ -98,10 +98,12 @@ custom_target(
         '@INPUT@',
     ],
     install: true,
-    install_dir: datadir / 'doc/netatalk/htmldocs',
+    install_dir: manual_install_path,
 )
 
-install_data(
-    'netatalk.css',
-    install_dir: datadir / 'doc/netatalk/htmldocs',
-)
+if get_option('with-manual') == 'local'
+    install_data(
+        'netatalk.css',
+        install_dir: manual_install_path,
+    )
+endif
diff --git a/doc/meson.build b/doc/meson.build
index 43c8f0c299..91bba3fd5e 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,6 +1,10 @@
 if build_xml_docs
     if get_option('with-manual') == 'www'
         input_file = 'html-www.xsl.in'
+        python = find_program('python3', required: false)
+        if python.found()
+            run_command(python, 'generate_compile_docs.py')
+        endif
     else
         input_file = 'html.xsl.in'
     endif
diff --git a/meson.build b/meson.build
index 3da111dae4..ffd9c02f68 100644
--- a/meson.build
+++ b/meson.build
@@ -101,6 +101,12 @@ else
     homedir = '/home'
 endif
 
+manual_install_path = get_option('with-manual-install-path')
+
+if manual_install_path == ''
+    manual_install_path = datadir / 'doc/netatalk/htmldocs'
+endif
+
 ##################
 # Compiler flags #
 ##################
diff --git a/meson_options.txt b/meson_options.txt
index e527c32666..69e30aeb59 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -279,6 +279,12 @@ option(
     value: '',
     description: 'Set path to Netatalk lockfile',
 )
+option(
+    'with-manual-install-path',
+    type: 'string',
+    value: '',
+    description: 'Set path where to install manual html pages',
+)
 option(
     'with-pam-path',
     type: 'string',