Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -387,7 +387,7 @@
 PYTHON_PORTSDIR=	${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
 # Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().
 .if !defined(_PORTS_ENV_CHECK) || exists(${PYTHON_PORTSDIR})
-PYTHON_PORTVERSION!=	${MAKE} -V PORTVERSION -C ${PYTHON_PORTSDIR}
+.include "${PYTHON_PORTSDIR}/Makefile.version"
 .endif
 # Create a 4 integer version string, prefixing 0 to the last token if
 # it's a single character. Only use the the first 3 tokens of
Index: lang/python27/Makefile
===================================================================
--- lang/python27/Makefile
+++ lang/python27/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	python27
-PORTVERSION=	2.7.11
+PORTVERSION=	${PYTHON_PORTVERSION}
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
@@ -73,6 +73,7 @@
 UCS2_CONFIGURE_ON=	--enable-unicode=ucs2
 UCS4_CONFIGURE_ON=	--enable-unicode=ucs4
 
+.include "${.CURDIR}/Makefile.version"
 .include <bsd.port.options.mk>
 
 # http://bugs.python.org/issue22521
Index: lang/python27/Makefile.version
===================================================================
--- /dev/null
+++ lang/python27/Makefile.version
@@ -0,0 +1,3 @@
+# Mk/Uses/python.mk includes this file, don't remove it!
+
+PYTHON_PORTVERSION=	2.7.11
Index: lang/python32/Makefile
===================================================================
--- lang/python32/Makefile
+++ lang/python32/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	python32
-PORTVERSION=	3.2.6
+PORTVERSION=	${PYTHON_PORTVERSION}
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
@@ -71,6 +71,7 @@
 TSC_CONFIGURE_WITH=	tsc
 UCS4_CONFIGURE_WITH=	wide-unicode
 
+.include "${.CURDIR}/Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUCS4}
Index: lang/python32/Makefile.version
===================================================================
--- /dev/null
+++ lang/python32/Makefile.version
@@ -0,0 +1,3 @@
+# Mk/Uses/python.mk includes this file, don't remove it!
+
+PYTHON_PORTVERSION=	3.2.6
Index: lang/python33/Makefile
===================================================================
--- lang/python33/Makefile
+++ lang/python33/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	python33
-PORTVERSION=	3.3.6
+PORTVERSION=	${PYTHON_PORTVERSION}
 PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
@@ -73,6 +73,7 @@
 
 TSC_CONFIGURE_WITH=	tsc
 
+.include "${.CURDIR}/Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYMALLOC}
Index: lang/python33/Makefile.version
===================================================================
--- /dev/null
+++ lang/python33/Makefile.version
@@ -0,0 +1,3 @@
+# Mk/Uses/python.mk includes this file, don't remove it!
+
+PYTHON_PORTVERSION=	3.3.6
Index: lang/python34/Makefile
===================================================================
--- lang/python34/Makefile
+++ lang/python34/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	python34
-PORTVERSION=	3.4.3
+PORTVERSION=	${PYTHON_PORTVERSION}
 PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
@@ -82,6 +82,7 @@
 
 TSC_CONFIGURE_WITH=	tsc
 
+.include "${.CURDIR}/Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYMALLOC}
Index: lang/python34/Makefile.version
===================================================================
--- /dev/null
+++ lang/python34/Makefile.version
@@ -0,0 +1,3 @@
+# Mk/Uses/python.mk includes this file, don't remove it!
+
+PYTHON_PORTVERSION=	3.4.3
Index: lang/python35/Makefile
===================================================================
--- lang/python35/Makefile
+++ lang/python35/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	python
-DISTVERSION=	3.5.1
+DISTVERSION=	${PYTHON_PORTVERSION}
 CATEGORIES=	lang python ipv6
-MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	PYTHON/ftp/python/${PYTHON_PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
 DISTNAME=	Python-${DISTVERSION}
 DIST_SUBDIR=	python
@@ -24,7 +24,6 @@
 CPE_VERSION=	${DISTVERSION}
 
 # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
-PYTHON_PORTVERSION=	${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}
 PYTHON_VER=		${PYTHON_PORTVERSION:R}
 PYTHON_VERSION=		python${PYTHON_VER}
 PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
@@ -89,6 +88,7 @@
 
 TSC_CONFIGURE_WITH=	tsc
 
+.include "${.CURDIR}/Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYMALLOC}
Index: lang/python35/Makefile.version
===================================================================
--- /dev/null
+++ lang/python35/Makefile.version
@@ -0,0 +1,3 @@
+# Mk/Uses/python.mk includes this file, don't remove it!
+
+PYTHON_PORTVERSION=	3.5.1