diff --git a/contrib/ci/fwupd_setup_helpers.py b/contrib/ci/fwupd_setup_helpers.py
index 252f93191..78ef72529 100755
--- a/contrib/ci/fwupd_setup_helpers.py
+++ b/contrib/ci/fwupd_setup_helpers.py
@@ -17,7 +17,7 @@ ENDC = "\033[0m"
 MINIMUM_MARKDOWN = (3, 3, 3)
 
 # Minimum meson required
-MINIMUM_MESON = "0.60.0"
+MINIMUM_MESON = "0.61.0"
 
 
 def get_possible_profiles():
diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in
index f0420a7f4..e7a7fe032 100644
--- a/contrib/fwupd.spec.in
+++ b/contrib/fwupd.spec.in
@@ -547,6 +547,8 @@ done
 %files devel
 %{_datadir}/gir-1.0/Fwupd-2.0.gir
 %{_datadir}/gir-1.0/FwupdPlugin-1.0.gir
+%{_datadir}/doc/fwupd/libfwupdplugin
+%{_datadir}/doc/fwupd/libfwupd
 %{_datadir}/doc/libfwupdplugin
 %{_datadir}/doc/libfwupd
 %{_datadir}/vala/vapi
diff --git a/docs/meson.build b/docs/meson.build
index 4b651f319..6b2809e9b 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -40,7 +40,7 @@ if gidocgen_dep.found() and docs_python_deps.allowed() and gidocgen_app.found()
     ],
     build_by_default: true,
     install: true,
-    install_dir: join_paths(datadir, 'doc'),
+    install_dir: join_paths(datadir, 'doc', 'fwupd'),
   )
 
   custom_target('doc-fwupdplugin',
@@ -66,15 +66,24 @@ if gidocgen_dep.found() and docs_python_deps.allowed() and gidocgen_app.found()
     ],
     build_by_default: true,
     install: true,
-    install_dir: join_paths(datadir, 'doc'),
+    install_dir: join_paths(datadir, 'doc', 'fwupd'),
   )
  install_data(['index.html', 'hsi.html'],
     install_dir : join_paths(datadir, 'doc', 'fwupd')
   )
  install_data(['urlmap_fwupd.js'],
-    install_dir: join_paths(datadir, 'doc', 'libfwupd')
+    install_dir: join_paths(datadir, 'doc', 'fwupd', 'libfwupd')
   )
  install_data(['urlmap_fwupdplugin.js'],
-    install_dir: join_paths(datadir, 'doc', 'libfwupdplugin')
+    install_dir: join_paths(datadir, 'doc', 'fwupd', 'libfwupdplugin')
+  )
+  #make devhelp work
+  install_symlink('libfwupd',
+    install_dir: join_paths(datadir, 'doc',),
+    pointing_to: join_paths('fwupd', 'libfwupd'),
+  )
+  install_symlink('libfwupdplugin',
+    install_dir: join_paths(datadir, 'doc',),
+    pointing_to: join_paths('fwupd', 'libfwupdplugin'),
   )
 endif
diff --git a/meson.build b/meson.build
index 599dc17b6..3d3b44519 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('fwupd', 'c',
   version: '1.8.4',
   license: 'LGPL-2.1+',
-  meson_version: '>=0.60.0',
+  meson_version: '>=0.61.0',
   default_options: ['warning_level=2', 'c_std=c99'],
 )
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f252b9551..57b48cb8a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -74,7 +74,7 @@ parts:
     after: [nettle]
   meson:
     plugin: python
-    source: https://github.com/mesonbuild/meson/releases/download/0.60.2/meson-0.60.2.tar.gz
+    source: https://github.com/mesonbuild/meson/releases/download/0.61.0/meson-0.61.0.tar.gz
     build-packages:
       - ninja-build
       - python3-distutils-extra