diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am
index 51f00caa92..4e61ba95cf 100644
--- a/docs/libnm-util/Makefile.am
+++ b/docs/libnm-util/Makefile.am
@@ -31,7 +31,6 @@ CFILE_GLOB=
 # Header files to ignore when scanning.
 IGNORE_HFILES= \
 	crypto.h \
-	nm-setting-ip6-config.h \
 	nm-setting-template.h \
 	nm-utils-private.h \
 	nm-param-spec-specialized.h
@@ -61,3 +60,4 @@ GTKDOC_LIBS = $(top_builddir)/libnm-util/libnm-util.la
 # include common portion ...
 include $(top_srcdir)/gtk-doc.make
 
+CLEANFILES += $(DOC_MAIN_SGML_FILE)
diff --git a/docs/libnm-util/libnm-util.types b/docs/libnm-util/libnm-util.types
index a0b1eadeb9..c651223e11 100644
--- a/docs/libnm-util/libnm-util.types
+++ b/docs/libnm-util/libnm-util.types
@@ -1,10 +1,13 @@
 #include <nm-connection.h>
 #include <nm-setting-8021x.h>
+#include <nm-setting-bluetooth.h>
 #include <nm-setting-cdma.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-gsm.h>
 #include <nm-setting.h>
 #include <nm-setting-ip4-config.h>
+#include <nm-setting-ip6-config.h>
+#include <nm-setting-olpc-mesh.h>
 #include <nm-setting-ppp.h>
 #include <nm-setting-pppoe.h>
 #include <nm-setting-serial.h>
@@ -13,18 +16,37 @@
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 
-nm_connection_get_type
-nm_setting_802_1x_get_type
-nm_setting_cdma_get_type
-nm_setting_connection_get_type
+nm_setting_gsm_error_get_type
 nm_setting_gsm_get_type
-nm_setting_get_type
-nm_setting_ip4_config_get_type
-nm_setting_ppp_get_type
-nm_setting_pppoe_get_type
+nm_setting_802_1x_error_get_type
+nm_setting_802_1x_get_type
+nm_setting_bluetooth_error_get_type
+nm_setting_bluetooth_get_type
+nm_setting_olpc_mesh_error_get_type
+nm_setting_olpc_mesh_get_type
+nm_setting_cdma_error_get_type
+nm_setting_cdma_get_type
+nm_setting_serial_error_get_type
 nm_setting_serial_get_type
-nm_setting_vpn_get_type
-nm_setting_wired_get_type
-nm_setting_wireless_get_type
+nm_setting_wireless_security_error_get_type
 nm_setting_wireless_security_get_type
-
+nm_setting_ip6_config_error_get_type
+nm_setting_ip6_config_get_type
+nm_setting_ip4_config_error_get_type
+nm_setting_ip4_config_get_type
+nm_setting_wired_error_get_type
+nm_setting_wired_get_type
+nm_setting_connection_error_get_type
+nm_setting_connection_get_type
+nm_setting_error_get_type
+nm_setting_get_type
+nm_setting_ppp_error_get_type
+nm_setting_ppp_get_type
+nm_connection_error_get_type
+nm_connection_get_type
+nm_setting_pppoe_error_get_type
+nm_setting_pppoe_get_type
+nm_setting_vpn_error_get_type
+nm_setting_vpn_get_type
+nm_setting_wireless_error_get_type
+nm_setting_wireless_get_type