diff --git a/sysadm/Makefile b/sysadm/Makefile
index 62dc3d0..1b14801 100644
--- a/sysadm/Makefile
+++ b/sysadm/Makefile
@@ -1,24 +1,30 @@
 # Minimal makefile for Sphinx documentation
 #
 
 # You can set these variables from the command line, and also
 # from the environment for the first two.
 SPHINXOPTS    ?=
 SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = .
 BUILDDIR      = _build
 
 # Put it first so that "make" without argument is like "make help".
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
 .PHONY: help Makefile
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile images-stamp
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+sphinx/%: Makefile images-stamp
+	@$(SPHINXBUILD) -M $* "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
 images-stamp:
 	$(MAKE) -C images
 	touch $@
+
+html: sphinx/html
+
+clean: sphinx/clean
+	$(MAKE) -C images clean
+	rm -f *-stamp