diff --git a/Doc/Makefile b/Doc/Makefile
index f6f4c721080c42..6626c87b6c9462 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -6,6 +6,7 @@
 # You can set these variables from the command line.
 PYTHON       = python3
 VENVDIR      = ./venv
+VENVDIR_PDF  = ./venv-pdf
 UV           = uv
 SPHINXBUILD  = PATH=$(VENVDIR)/bin:$$PATH sphinx-build
 BLURB        = PATH=$(VENVDIR)/bin:$$PATH blurb
@@ -162,7 +163,7 @@ clean: clean-venv
 
 .PHONY: clean-venv
 clean-venv:
-	rm -rf $(VENVDIR)
+	rm -rf $(VENVDIR) $(VENVDIR_PDF)
 
 .PHONY: venv
 venv:
@@ -183,6 +184,25 @@ venv:
 		echo "The venv has been created in the $(VENVDIR) directory"; \
 	fi
 
+.PHONY: venv-pdf
+venv-pdf:
+	@if [ -d $(VENVDIR_PDF) ] ; then \
+		echo "venv-pdf already exists."; \
+		echo "To recreate it, remove it first with \`make clean-venv'."; \
+	else \
+		set -e; \
+		echo "Creating venv in $(VENVDIR_PDF)"; \
+		if $(UV) --version >/dev/null 2>&1; then \
+			$(UV) venv --python=$(PYTHON) $(VENVDIR_PDF); \
+			VIRTUAL_ENV=$(VENVDIR_PDF) $(UV) pip install -r requirements-pdf.txt; \
+		else \
+			$(PYTHON) -m venv $(VENVDIR_PDF); \
+			$(VENVDIR_PDF)/bin/python3 -m pip install --upgrade pip; \
+			$(VENVDIR_PDF)/bin/python3 -m pip install -r requirements-pdf.txt; \
+		fi; \
+		echo "The venv has been created in the $(VENVDIR_PDF) directory"; \
+	fi
+
 .PHONY: dist-no-html
 dist-no-html: dist-text dist-epub dist-texinfo
 
@@ -230,18 +250,18 @@ dist-text:
 	@echo "Build finished and archived!"
 
 .PHONY: dist-pdf
-dist-pdf:
+dist-pdf: venv-pdf
 	# archive the A4 latex
 	@echo "Building LaTeX (A4 paper)..."
 	mkdir -p dist
 	rm -rf build/latex
 	find dist -name 'python-$(DISTVERSION)-docs-pdf*' -exec rm -rf {} \;
-	$(MAKE) latex PAPER=a4
+	-$(MAKE) latex PAPER=a4 VENVDIR=$(VENVDIR_PDF)
 	# remove zip & bz2 dependency on all-pdf,
 	# as otherwise the full latexmk process is run twice.
 	# ($$ is needed to escape the $; https://www.gnu.org/software/make/manual/make.html#Basics-of-Variable-References)
 	-sed -i 's/: all-$$(FMT)/:/' build/latex/Makefile
-	(cd build/latex; $(MAKE) clean && $(MAKE) --jobs=$$((`nproc`+1)) --output-sync LATEXMKOPTS='-quiet' all-pdf && $(MAKE) FMT=pdf zip bz2)
+	(cd build/latex; $(MAKE) clean && $(MAKE) --jobs=$$((`nproc`+1)) --output-sync --keep-going LATEXMKOPTS='-quiet' all-pdf; $(MAKE) FMT=pdf zip bz2)
 	cp build/latex/docs-pdf.zip dist/python-$(DISTVERSION)-docs-pdf-a4.zip
 	cp build/latex/docs-pdf.tar.bz2 dist/python-$(DISTVERSION)-docs-pdf-a4.tar.bz2
 	@echo "Build finished and archived!"
diff --git a/Doc/conf.py b/Doc/conf.py
index a8e376c0ae44fe..21526a904dc232 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -44,6 +44,7 @@
 _OPTIONAL_EXTENSIONS = (
     'notfound.extension',
     'sphinxext.opengraph',
+    'sphinxcontrib.rsvgconverter',
 )
 for optional_ext in _OPTIONAL_EXTENSIONS:
     try:
@@ -113,7 +114,7 @@
 # Ignore any .rst files in the includes/ directory;
 # they're embedded in pages but not rendered as individual pages.
 # Ignore any .rst files in the venv/ directory.
-exclude_patterns = ['includes/*.rst', 'venv/*', 'README.rst']
+exclude_patterns = ['includes/*.rst', 'venv/*', 'venv-pdf/*', 'README.rst']
 venvdir = os.getenv('VENVDIR')
 if venvdir is not None:
     exclude_patterns.append(venvdir + '/*')
@@ -354,6 +355,7 @@
 \let\Verbatim=\OriginalVerbatim
 \let\endVerbatim=\endOriginalVerbatim
 \setcounter{tocdepth}{2}
+\makeatletter\let\@toodeep\relax\makeatother
 ''',
     # The paper size ('letterpaper' or 'a4paper').
     'papersize': 'a4paper',
diff --git a/Doc/requirements-pdf.txt b/Doc/requirements-pdf.txt
new file mode 100644
index 00000000000000..b9713817a6f044
--- /dev/null
+++ b/Doc/requirements-pdf.txt
@@ -0,0 +1,3 @@
+-r requirements.txt
+
+sphinxcontrib-svg2pdfconverter~=2.0.0