diff --git a/.gitignore b/.gitignore
index db9a2e86a2..b21bbf5c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,6 +95,7 @@ test-*.trs
 /docs/api/NetworkManager-*.txt
 /docs/api/NetworkManager-decl-list.txt.bak
 /docs/api/NetworkManager-decl.txt.bak
+/docs/api/NetworkManager.actions
 /docs/api/NetworkManager.args
 /docs/api/NetworkManager.hierarchy
 /docs/api/NetworkManager.interfaces
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index dfa3210c68..4f370449a2 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -126,9 +126,19 @@ setup-build.stamp:
 
 ####################################
 
-EXTRA_DIST += version.xml.in settings-spec.xsl meson.build $(GENERATED_FILES)
-CLEANFILES += html/* tmpl/* xml/* \
-	NetworkManager-sections.txt \
-	NetworkManager-overrides.txt
+EXTRA_DIST += \
+	version.xml.in \
+	settings-spec.xsl \
+	meson.build \
+	$(GENERATED_FILES) \
+	$(NULL)
 
-CLEANFILES += settings-spec.xml
+CLEANFILES += \
+	html/* \
+	tmpl/* \
+	xml/* \
+	NetworkManager-overrides.txt \
+	NetworkManager-sections.txt \
+	NetworkManager.actions \
+	settings-spec.xml \
+	$(NULL)
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
index b637f79835..5328bd6586 100644
--- a/docs/libnm/Makefile.am
+++ b/docs/libnm/Makefile.am
@@ -100,16 +100,19 @@ GTKDOC_LIBS = \
 # include common portion ...
 include $(top_srcdir)/gtk-doc.make
 
-EXTRA_DIST += version.xml.in meson.build
+EXTRA_DIST += \
+	version.xml.in \
+	meson.build \
+	$(NULL)
 
 CLEANFILES += \
-	libnm-sections.txt \
-	libnm-overrides.txt \
 	html/* \
 	tmpl/* \
-	xml/*
-
-DISTCLEANFILES = libnm.actions
+	xml/* \
+	libnm-overrides.txt \
+	libnm-sections.txt \
+	libnm.actions \
+	$(NULL)
 
 if GTK_DOC_BUILD_HTML
 check-local-gtk-doc-patch: