diff --git a/Makefile b/Makefile
index 21794191d8b32c..f05b9ad942fb2d 100644
--- a/Makefile
+++ b/Makefile
@@ -813,6 +813,11 @@ out/doc/api/all.json: $(apidocs_json) tools/doc/alljson.js
 docopen: $(apidocs_html)
 	@$(PYTHON) -mwebbrowser file://$(PWD)/out/doc/api/all.html
 
+.PHONY: docserve
+docserve: $(apidocs_html)
+	@$(PYTHON) -mwebbrowser http://localhost:8000/all.html
+	@$(PYTHON) -m http.server -d $(PWD)/out/doc/api
+
 .PHONY: docclean
 docclean:
 	$(RM) -r out/doc