diff --git a/contrib/ci/ubuntu.sh b/contrib/ci/ubuntu.sh
index 8be1673ff..b0dcddcd0 100755
--- a/contrib/ci/ubuntu.sh
+++ b/contrib/ci/ubuntu.sh
@@ -15,7 +15,7 @@ ninja -C build test -v
 #make docs available outside of docker
 ninja -C build install -v
 mkdir -p dist/docs
-cp build/docs/libfwupd/* dist/docs -R
+cp build/docs/* dist/docs -R
 
 #run static analysis (these mostly won't be critical)
 ninja -C build scan-build -v
diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in
index 5692e2821..60f9c6770 100644
--- a/contrib/fwupd.spec.in
+++ b/contrib/fwupd.spec.in
@@ -370,7 +370,7 @@ rm ${RPM_BUILD_ROOT}%{_sbindir}/flashrom
 
 %files devel
 %{_datadir}/gir-1.0/Fwupd-2.0.gir
-%{_datadir}/gtk-doc/html/libfwupd
+%{_datadir}/gtk-doc/html/fwupd
 %{_datadir}/vala/vapi
 %{_includedir}/fwupd-1
 %{_libdir}/libfwupd*.so
diff --git a/docs/libfwupd/libfwupd-docs.xml b/docs/fwupd-docs.xml
similarity index 94%
rename from docs/libfwupd/libfwupd-docs.xml
rename to docs/fwupd-docs.xml
index ec27ea641..1852fb312 100644
--- a/docs/libfwupd/libfwupd-docs.xml
+++ b/docs/fwupd-docs.xml
@@ -41,13 +41,31 @@
         Functionality available to plugins.
       </para>
     </partintro>
+    <xi:include href="xml/fu-archive.xml"/>
     <xi:include href="xml/fu-chunk.xml"/>
+    <xi:include href="xml/fu-common-cab.xml"/>
+    <xi:include href="xml/fu-common-guid.xml"/>
+    <xi:include href="xml/fu-common-version.xml"/>
     <xi:include href="xml/fu-common.xml"/>
     <xi:include href="xml/fu-device-locker.xml"/>
     <xi:include href="xml/fu-device-metadata.xml"/>
     <xi:include href="xml/fu-device.xml"/>
+    <xi:include href="xml/fu-dfu-firmware.xml"/>
+    <xi:include href="xml/fu-firmware-common.xml"/>
+    <xi:include href="xml/fu-firmware-image.xml"/>
+    <xi:include href="xml/fu-firmware.xml"/>
+    <xi:include href="xml/fu-history.xml"/>
+    <xi:include href="xml/fu-hwids.xml"/>
+    <xi:include href="xml/fu-ihex-firmware.xml"/>
+    <xi:include href="xml/fu-srec-firmware.xml"/>
+    <xi:include href="xml/fu-io-channel.xml"/>
+    <xi:include href="xml/fu-mutex.xml"/>
+    <xi:include href="xml/fu-plugin-vfuncs.xml"/>
     <xi:include href="xml/fu-plugin.xml"/>
+    <xi:include href="xml/fu-progressbar.xml"/>
     <xi:include href="xml/fu-quirks.xml"/>
+    <xi:include href="xml/fu-smbios.xml"/>
+    <xi:include href="xml/fu-test.xml"/>
     <xi:include href="xml/fu-udev-device.xml"/>
     <xi:include href="xml/fu-usb-device.xml"/>
   </reference>
diff --git a/docs/libfwupd/clean.sh b/docs/libfwupd/clean.sh
deleted file mode 100644
index 87ebedbe6..000000000
--- a/docs/libfwupd/clean.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-rm -f *.txt
-rm -rf html/
-rm -rf xml/
-rm -rf tmpl/
-rm -f *.stamp
diff --git a/docs/libfwupd/libfwupd.types b/docs/libfwupd/libfwupd.types
deleted file mode 100644
index 0fbcf8158..000000000
--- a/docs/libfwupd/libfwupd.types
+++ /dev/null
@@ -1,6 +0,0 @@
-fwupd_client_get_type
-fwupd_device_get_type
-fwupd_quirks_get_type
-fwupd_release_get_type
-fwupd_remote_get_type
-fwupd_result_get_type
diff --git a/docs/libfwupd/meson.build b/docs/libfwupd/meson.build
deleted file mode 100644
index a69b5bab9..000000000
--- a/docs/libfwupd/meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
-gnome.gtkdoc(
-  'libfwupd',
-  src_dir : [
-    join_paths(meson.source_root(), 'libfwupd'),
-    join_paths(meson.source_root(), 'src'),
-    join_paths(meson.build_root(), 'libfwupd'),
-    join_paths(meson.build_root(), 'src'),
-  ],
-  main_xml : 'libfwupd-docs.xml',
-  install : true
-)
diff --git a/docs/meson.build b/docs/meson.build
index 378ee9ffc..ffad58d47 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1 +1,11 @@
-subdir('libfwupd')
+gnome.gtkdoc(
+  'fwupd',
+  src_dir : [
+    join_paths(meson.source_root(), 'libfwupd'),
+    join_paths(meson.source_root(), 'src'),
+    join_paths(meson.build_root(), 'libfwupd'),
+    join_paths(meson.build_root(), 'src'),
+  ],
+  main_xml : 'fwupd-docs.xml',
+  install : true
+)