diff --git a/docs/Makefile.local b/docs/Makefile.local
--- a/docs/Makefile.local
+++ b/docs/Makefile.local
@@ -1,4 +1,8 @@
 sphinx/html: sql-autodoc
+	if [ -f "$(CURDIR)/images/Makefile" ]; then \
+		make -C $(CURDIR)/images/ $@; \
+	fi
+	$(SPHINXBUILD) -b html $(SPHINX_SRCDIR) $(SPHINX_BUILDDIR)/html $(SPHINXOPTS)
 sql-autodoc:
 	make -C ../sql/ doc
 
@@ -6,6 +10,17 @@
 clean-sql-autodoc:
 	make -C ../sql/ clean
 
+sphinx/clean:
+	if [ -f "$(CURDIR)/images/Makefile" ]; then \
+		make -C $(CURDIR)/images/ clean; \
+	fi
+	$(SPHINXBUILD) -M clean $(SPHINX_SRCDIR) $(SPHINX_BUILDDIR) $(SPHINXOPTS)
+sphinx/%: $(apidoc_dep)
+	if [ -f "$(CURDIR)/images/Makefile" ]; then \
+		make -C $(CURDIR)/images/ $@; \
+	fi
+	$(SPHINXBUILD) -b $* $(SPHINX_SRCDIR) $(SPHINX_BUILDDIR)/$* $(SPHINXOPTS)
+
 .PHONY: sql-autodoc clean-sql-autodoc
 
 # Local Variables:
diff --git a/docs/images/Makefile b/docs/images/Makefile
--- a/docs/images/Makefile
+++ b/docs/images/Makefile
@@ -1,9 +1,13 @@
 
 BUILD_TARGETS =
-BUILD_TARGETS += archive-copies.pdf archive-copies.svg
+BUILD_TARGETS += swh-archive-copies.pdf swh-archive-copies.svg
 
 all: $(BUILD_TARGETS)
 
+sphinx/html: all
+
+sphinx/clean: clean
+
 
 # dia exporters