diff --git a/Makefile.sphinx b/Makefile.sphinx
index 03b277ef8dfea85466e4613f53f8417327522fde..01e80e52ec6935de01531022a1ae5715649e37ee 100644
--- a/Makefile.sphinx
+++ b/Makefile.sphinx
@@ -2,7 +2,7 @@
 # automatically build sphinx documentation.
 
 APIDOC_DIR = apidoc
-APIDOC_OPTS = --ext-viewcode --separate
+APIDOC_OPTS = --ext-viewcode --separate --implicit-namespaces
 SPHINXBUILD = sphinx-build
 SPHINXAPIDOC = sphinx-apidoc
 SPHINX_OPTS = -t standalone_package_doc
@@ -34,7 +34,7 @@ sphinx/%: $(apidoc_dep)
 
 apidoc: $(apidoc_dep)
 apidoc-stamp:
-	$(SPHINXAPIDOC) $(APIDOC_OPTS) -o $(APIDOC_DIR) .. $(APIDOC_SWH_EXCLUDES)
+	$(SPHINXAPIDOC) $(APIDOC_OPTS) -o $(APIDOC_DIR) ../swh $(APIDOC_SWH_EXCLUDES)
 	# to silent Sphinx warnings about apidoc documents not included in any toctree
 	find $(shell pwd)/apidoc -name "*.rst" | xargs sed -i '1i:orphan:\n'
 	touch $@