diff --git a/Makefile b/Makefile
index 5bcdf07b5fe..4f98a48c87c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ BUILDER      = html
 JOBS         = 8
 SOURCES      =
 OUTPUT_DIR   = build
-SPHINXERRORHANDLING =
+SPHINXERRORHANDLING = -W --keep-going -w sphinx-warnings.txt
 
 ALLSPHINXOPTS = -b $(BUILDER) -j $(JOBS) \
                 $(SPHINXOPTS) $(SPHINXERRORHANDLING) . $(OUTPUT_DIR) $(SOURCES)
@@ -29,11 +29,6 @@ dirhtml: BUILDER = dirhtml
 dirhtml: venv rss
 	$(SPHINXBUILD) $(ALLSPHINXOPTS)
 
-## fail-warning   to render PEPs to "pep-NNNN.html" files and fail the Sphinx build on any warning
-.PHONY: fail-warning
-fail-warning: venv
-	$(SPHINXBUILD) $(ALLSPHINXOPTS) -W
-
 ## check-links    to check validity of links within PEP sources
 .PHONY: check-links
 check-links: BUILDER = linkcheck