diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	python-doc-${DOCFORMAT}
 PORTVERSION=	${PYTHON_PORTVERSION}
 CATEGORIES=	lang python
-MASTER_SITES=	PYTHON/ftp/python/doc/${PORTVERSION} \
+MASTER_SITES?=	PYTHON/ftp/python/doc/${PORTVERSION} \
 		PYTHON/ftp/python/doc/current
 DISTNAME=	python-${PORTVERSION}-docs-${DOCFORMAT}
 DIST_SUBDIR=	python
@@ -38,7 +38,7 @@
 
 all_python_versions:
 .for v in ${_VERS}
-	@${MAKE} -V PYTHON_PORTVERSION DEFAULT_VERSIONS=python=${v}
+	@${MAKE} -C ${PORTSDIR}/lang/python${v:S/.//} -V PYTHON_PORTVERSION
 .endfor
 
 .if make(makesum)
@@ -54,6 +54,7 @@
 .endfor
 .endfor
 MASTER_SITES+=	PYTHON/ftp/python/doc/current
+.export MASTER_SITES
 .endif
 
 pre-install: