Index: lang/python-doc-html/Makefile
===================================================================
--- lang/python-doc-html/Makefile
+++ lang/python-doc-html/Makefile
@@ -2,16 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	python-doc-${DOCFORMAT}
-PORTVERSION=	${PYTHON_PORTVERSION}
+PORTVERSION=	${PYTHON_DOCVERSION}
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/doc/${PORTVERSION} \
 		PYTHON/ftp/python/doc/current
-DISTNAME=	python-${PORTVERSION}-docs-${DOCFORMAT}
+DISTNAME=	python-${PORTVERSION}${DISTVERSIONSUFFIX}-docs-${DOCFORMAT}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Documentation for the Python programming language
 
+# Only set these when the docversion is not in line with latest pythonXY
+PYTHON34_DOCVERSION=	3.4.3
+PYTHON35_DOCVERSION=	3.5.0
+
 PORTSCOUT=	ignore:1
 
 NO_ARCH=	yes
@@ -31,6 +35,18 @@
 WRKSRC=		${WRKDIR}/docs-pdf
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if defined(PYTHON${PYTHON_SUFFIX}_DOCVERSION)
+PYTHON_DOCVERSION=	${PYTHON${PYTHON_SUFFIX}_DOCVERSION}
+.else
+PYTHON_DOCVERSION=	${PYTHON_PORTVERSION}
+.endif
+
+.if ${PYTHON_SUFFIX} == "35"
+DISTVERSIONSUFFIX=	a3
+.endif
+
 pre-install:
 	@${FIND} ${WRKSRC} -type f | ${SED} -e 's|^${WRKSRC}|%%DOCSDIR%%|' | ${SORT} > ${PLIST}
 
@@ -38,4 +54,4 @@
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: lang/python-doc-html/distinfo
===================================================================
--- lang/python-doc-html/distinfo
+++ lang/python-doc-html/distinfo
@@ -1,24 +1,48 @@
-SHA256 (python/python-2.7.11-docs-html.tar.bz2) = 806917ebf99d5b572831583070e44db341405634d5cfdd795ef1e608c05221e8
-SIZE (python/python-2.7.11-docs-html.tar.bz2) = 4575554
-SHA256 (python/python-2.7.11-docs-pdf-a4.tar.bz2) = 1e47a79d5860ade96526ff7b340d1a1402886428c7e5ef809cc4a4d5f53dcbb3
-SIZE (python/python-2.7.11-docs-pdf-a4.tar.bz2) = 10604395
-SHA256 (python/python-2.7.11-docs-pdf-letter.tar.bz2) = b774f15ee0b174041351a8c57c543acda441d0b25f991007f62d0e701b87af2d
-SIZE (python/python-2.7.11-docs-pdf-letter.tar.bz2) = 10661547
-SHA256 (python/python-2.7.11-docs-text.tar.bz2) = fc49ac7083123dd6dd53a91a48602f48289c5d04b073da7634322e595d1e280e
-SIZE (python/python-2.7.11-docs-text.tar.bz2) = 1607237
+TIMESTAMP = 1467450143
+SHA256 (python/python-2.7.12-docs-html.tar.bz2) = 40891e010cdd9a752a17bd02e30aa853f9a2a7767ee82911cf4507dfa3b13de8
+SIZE (python/python-2.7.12-docs-html.tar.bz2) = 4601696
+TIMESTAMP = 1467449898
+SHA256 (python/python-2.7.12-docs-pdf-a4.tar.bz2) = d7d2d1941855520220ab37f474d5534b8ffe1e0f073e62b14e5d5780caae7ddc
+SIZE (python/python-2.7.12-docs-pdf-a4.tar.bz2) = 10687064
+TIMESTAMP = 1467449918
+SHA256 (python/python-2.7.12-docs-pdf-letter.tar.bz2) = c501cd12eb666b3dab32dd4ecf91d873e9a578401afcb94f7e0a3529a971eee0
+SIZE (python/python-2.7.12-docs-pdf-letter.tar.bz2) = 10741538
+TIMESTAMP = 1467449932
+SHA256 (python/python-2.7.12-docs-text.tar.bz2) = 83a39db742ccae75c2660ea816a5c71ceffb8ad67238a7cbbb31d992725e87ea
+SIZE (python/python-2.7.12-docs-text.tar.bz2) = 1610618
+TIMESTAMP = 1467450269
 SHA256 (python/python-3.3.6-docs-html.tar.bz2) = 54da33f8a91be819e7ac22fdc88c5125bdd4c67494f52dd79d6b603572c41fb0
 SIZE (python/python-3.3.6-docs-html.tar.bz2) = 4961517
+TIMESTAMP = 1467450309
 SHA256 (python/python-3.3.6-docs-pdf-a4.tar.bz2) = 5a031f0abfe41121f9aa883cfb8a99e36363744c486d30d97a9bcf4c0b7a634b
 SIZE (python/python-3.3.6-docs-pdf-a4.tar.bz2) = 11298923
+TIMESTAMP = 1467450344
 SHA256 (python/python-3.3.6-docs-pdf-letter.tar.bz2) = 3b01fdbb8c8589e247677313cedb65837cdd1c68ce29d0a62c8b35790d2a2da3
 SIZE (python/python-3.3.6-docs-pdf-letter.tar.bz2) = 11343796
+TIMESTAMP = 1467450357
 SHA256 (python/python-3.3.6-docs-text.tar.bz2) = 1b4ddbdd83658846fe968e282c7873f8c58e41d892bc7e54cdf20c1435e8bed7
 SIZE (python/python-3.3.6-docs-text.tar.bz2) = 1779902
+TIMESTAMP = 1467451000
 SHA256 (python/python-3.4.3-docs-html.tar.bz2) = 87d4f8739205fe6f2cbcb10c6f1b33546d3b7f41e6bc96de34f992ccf5c10fbf
 SIZE (python/python-3.4.3-docs-html.tar.bz2) = 5444773
-SHA256 (python/python-3.4.3-docs-text.tar.bz2) = 03f851f8d078680fccff67a9bedbc698c5e4b5bdd25477e9a6b397080ef46ce2
-SIZE (python/python-3.4.3-docs-text.tar.bz2) = 1969598
+TIMESTAMP = 1467451248
 SHA256 (python/python-3.4.3-docs-pdf-a4.tar.bz2) = c8a4ff78b1bb92aaf079b057802839947d6dd67a8e6ec4952627e3734380c8c8
 SIZE (python/python-3.4.3-docs-pdf-a4.tar.bz2) = 11803193
+TIMESTAMP = 1467451286
 SHA256 (python/python-3.4.3-docs-pdf-letter.tar.bz2) = 6441397672b65c95cb589e8a9b0ccde3b32063906ee980df2d1db021337bcc3a
 SIZE (python/python-3.4.3-docs-pdf-letter.tar.bz2) = 11894229
+TIMESTAMP = 1467451295
+SHA256 (python/python-3.4.3-docs-text.tar.bz2) = 03f851f8d078680fccff67a9bedbc698c5e4b5bdd25477e9a6b397080ef46ce2
+SIZE (python/python-3.4.3-docs-text.tar.bz2) = 1969598
+TIMESTAMP = 1467451344
+SHA256 (python/python-3.5.0a3-docs-html.tar.bz2) = 26ad1f229449cd383985d1237c3ae303178c04f61bb1f1cad3c092510d19a35b
+SIZE (python/python-3.5.0a3-docs-html.tar.bz2) = 5620858
+TIMESTAMP = 1467451369
+SHA256 (python/python-3.5.0a3-docs-pdf-a4.tar.bz2) = 52481231ed857b84f536b9080c1a995d7ed7bf1fdd8becd9af6054bace040ac9
+SIZE (python/python-3.5.0a3-docs-pdf-a4.tar.bz2) = 11970248
+TIMESTAMP = 1467451379
+SHA256 (python/python-3.5.0a3-docs-pdf-letter.tar.bz2) = ac7d8e520df41ce07845f4c5c2f63d4fe01fc520b97ca11de5042876433e59ee
+SIZE (python/python-3.5.0a3-docs-pdf-letter.tar.bz2) = 12034420
+TIMESTAMP = 1467451388
+SHA256 (python/python-3.5.0a3-docs-text.tar.bz2) = 453466b97223092ca5b835a49b049a9ae08d44cd3da8f286200a47199309b6db
+SIZE (python/python-3.5.0a3-docs-text.tar.bz2) = 1963129