diff --git a/UPDATING b/UPDATING
index 9f910298cfb2..3ff4e78a883e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,23 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20130817:
+  AFFECTS: users of lang/python*
+  AUTHOR: mva@FreeBSD.org
+
+  The lang/python* ports do not install links to 2to3, idle, pydoc, python
+  and other binaries anymore. Those were moved into the lang/python2 and
+  lang/python3 ports respectively. This change brings us closer to the goal
+  of making Python ports usable with different Python versions at the same
+  time.
+
+  If you have lang/python2* or lang/python3* installed, please also install
+  the associated lang/python2 or lang/python3 port.
+
+  1. update lang/python2* and/or lang/python3*
+  2. install lang/python2 and/or lang/python3
+  3. reinstall lang/python (if installed)
+
 20130816:
   AFFECTS: users of graphics/opendx and math/octave-forge-octcdf
   AUTHOR: stephen@FreeBSD.org
diff --git a/lang/python/Makefile b/lang/python/Makefile
index b6f47d05dc20..bf77a20c7f21 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    python
-# Date created:         08 August 1995
-# Whom:                 jkh
-#
+# Created by: jkh
 # $FreeBSD$
-#
 
 PORTNAME=	python
 PORTVERSION=	${PYTHON_VER}
@@ -17,11 +13,42 @@ MAINTAINER=	python@FreeBSD.org
 COMMENT=	The "meta-port" for the default version of Python interpreter
 
 USE_PYTHON_RUN=	yes
-PYTHON_VERSION=	${PYTHON_DEFAULT_VERSION}
 NO_BUILD=	yes
 
+PLIST_FILES=	bin/2to3 \
+		bin/idle \
+		bin/pydoc \
+		bin/python \
+		bin/python-config \
+		bin/python-shared \
+		bin/python-shared-config
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_MAJOR_VER} == 2
+RUN_DEPENDS+=	python2:${PORTSDIR}/lang/python2
+PLIST_FILES+=	bin/smtpd.py
+.elif ${PYTHON_MAJOR_VER} == 3
+RUN_DEPENDS+=	python3:${PORTSDIR}/lang/python3
+.endif
+
 do-install:
-	@${DO_NADA}
+.for file in python python-shared
+	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} ${PREFIX}/bin/${file}
+.endfor
+	${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER} ${PREFIX}/bin/2to3
+.if ${PYTHON_MAJOR_VER} == 2
+	${LN} -sf ${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py ${PREFIX}/bin/smtpd.py
+.for file in idle pydoc
+	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} ${PREFIX}/bin/${file}
+.endfor
+.elif ${PYTHON_MAJOR_VER} == 3
+.for file in idle pydoc
+	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} ${PREFIX}/bin/${file}
+.endfor
+.endif
+	${LN} -sf ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config ${PREFIX}/bin/python-config
+	${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config ${PREFIX}/bin/python-shared-config
 
 # Major upgrade support
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade
@@ -61,4 +88,4 @@ upgrade-site-packages:
 		fi; \
 	fi; \
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/python2/Makefile b/lang/python2/Makefile
new file mode 100644
index 000000000000..99b47276cc13
--- /dev/null
+++ b/lang/python2/Makefile
@@ -0,0 +1,52 @@
+# $FreeBSD$
+
+PORTNAME=	python2
+PORTVERSION=	${PYTHON_MAJOR_VER}
+CATEGORIES=	lang python ipv6
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	python@FreeBSD.org
+COMMENT=	The "meta-port" for version 2 of the Python interpreter
+
+USE_PYTHON_RUN=	yes
+PYTHON_VERSION=	${PYTHON_DEFAULT_VERSION}
+NO_BUILD=	yes
+
+PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER} \
+		bin/idle${PYTHON_MAJOR_VER} \
+		bin/pydoc${PYTHON_MAJOR_VER} \
+		bin/python${PYTHON_MAJOR_VER} \
+		bin/python${PYTHON_MAJOR_VER}-config \
+		bin/python-shared${PYTHON_MAJOR_VER} \
+		bin/python-shared${PYTHON_MAJOR_VER}-config \
+		bin/smtpd${PYTHON_MAJOR_VER}.py
+
+.include <bsd.port.pre.mk>
+
+do-install:
+.for file in idle pydoc python python-shared
+	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_VER} ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
+.endfor
+	${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_VER} ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
+	${LN} -sf ${PREFIX}/bin/smtpd${PYTHON_VER}.py ${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py
+	${LN} -sf ${PREFIX}/bin/python${PYTHON_VER}-config ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
+	${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_VER}-config ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config
+
+# Major upgrade support
+PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade
+
+.if defined(USE_PORTMASTER)
+PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
+.endif
+
+.if defined(WITH_PKGNG)
+PKG_LIST=	${PKG_BIN} query -a '%n-%v'
+PKG_LIST_FILES=	${PKG_INFO} -l
+.else
+PKG_LIST=	${PKG_INFO} -Ea
+PKG_LIST_FILES=	${PKG_INFO} -L
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/lang/python2/pkg-descr b/lang/python2/pkg-descr
new file mode 100644
index 000000000000..f595c479c814
--- /dev/null
+++ b/lang/python2/pkg-descr
@@ -0,0 +1,4 @@
+Python is an interpreted object-oriented programming language, and is
+often compared to Tcl, Perl or Scheme.
+
+WWW: http://www.python.org/
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 90f003be3936..24ff81cb93d2 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	python26
 PORTVERSION=	2.6.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -50,7 +50,6 @@ BINLINKS_SUB_TMPL=	-e 's,smtpd,smtpd%%VERSION%%,' \
 			-e 's,2to3,2to3-%%VERSION%%,' \
 			-e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,'
 BINLINKS_SUB_PYTHON_VER=	${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g}
-BINLINKS_SUB_PYTHON_MAJOR_VER=	${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_MAJOR_VER}/g}
 
 OPTIONS_DEFINE=		THREADS SEM PTH PYMALLOC IPV6 FPECTL EXAMPLES NLS
 OPTIONS_DEFAULT=	THREADS UCS4 PYMALLOC IPV6
@@ -86,13 +85,6 @@ SEM_MSG=	"@comment "
 SUB_FILES=	pkg-message
 SUB_LIST=	SEM=${SEM_MSG}
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-MLINKS=		${PYTHON_VERSION}.1 python.1
-PLIST_SUB+=	IF_DEFAULT=""
-.else
-PLIST_SUB+=	IF_DEFAULT="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 .if ${PORT_OPTIONS:MPTH}
@@ -267,15 +259,6 @@ post-install:
 	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-	for f in ${BIN_FILES}; do \
-		TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB_PYTHON_VER}`; \
-		TARGET_MAJOR=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB_PYTHON_MAJOR_VER}`; \
-		cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$TARGET_MAJOR; \
-		cd ${PREFIX}/bin && ${LN} -sf $$TARGET_MAJOR $$f; \
-	done
-.endif
-
 .if !defined(NOPORTDATA)
 	@${MKDIR} ${DATADIR}
 	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index d44b076734c0..de185c964864 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -1,26 +1,10 @@
-%%IF_DEFAULT%%bin/2to3
-%%IF_DEFAULT%%bin/2to3-%%PYMAJOR%%
 bin/2to3-%%PYVER%%
-%%IF_DEFAULT%%bin/idle
-%%IF_DEFAULT%%bin/idle%%PYMAJOR%%
 bin/idle%%PYVER%%
-%%IF_DEFAULT%%bin/pydoc
-%%IF_DEFAULT%%bin/pydoc%%PYMAJOR%%
 bin/pydoc%%PYVER%%
-%%IF_DEFAULT%%bin/python
-%%IF_DEFAULT%%bin/python%%PYMAJOR%%
 bin/python%%PYVER%%
-%%IF_DEFAULT%%bin/python-config
-%%IF_DEFAULT%%bin/python%%PYMAJOR%%-config
 bin/python%%PYVER%%-config
-%%IF_DEFAULT%%bin/python-shared
-%%IF_DEFAULT%%bin/python-shared%%PYMAJOR%%
 bin/python-shared%%PYVER%%
-%%IF_DEFAULT%%bin/python-shared-config
-%%IF_DEFAULT%%bin/python-shared%%PYMAJOR%%-config
 bin/python-shared%%PYVER%%-config
-%%IF_DEFAULT%%bin/smtpd.py
-%%IF_DEFAULT%%bin/smtpd%%PYMAJOR%%.py
 bin/smtpd%%PYVER%%.py
 %%PYTHON_INCLUDEDIR%%/Python-ast.h
 %%PYTHON_INCLUDEDIR%%/Python.h
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index b64738262dba..1f1a9d07b5e3 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	python27
 PORTVERSION=	2.7.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -48,7 +48,6 @@ BINLINKS_SUB_TMPL=	-e 's,smtpd,smtpd%%VERSION%%,' \
 			-e 's,2to3,2to3-%%VERSION%%,' \
 			-e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,'
 BINLINKS_SUB_PYTHON_VER=	${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g}
-BINLINKS_SUB_PYTHON_MAJOR_VER=	${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_MAJOR_VER}/g}
 
 OPTIONS_DEFINE=		THREADS SEM PTH PYMALLOC IPV6 FPECTL EXAMPLES NLS
 OPTIONS_DEFAULT=	THREADS UCS4 PYMALLOC IPV6
@@ -80,13 +79,6 @@ SEM_MSG=	"@comment "
 SUB_FILES=	pkg-message
 SUB_LIST=	SEM=${SEM_MSG}
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-MLINKS=		${PYTHON_VERSION}.1 python.1
-PLIST_SUB+=	IF_DEFAULT=""
-.else
-PLIST_SUB+=	IF_DEFAULT="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 .if ${PORT_OPTIONS:MPTH}
@@ -274,19 +266,6 @@ post-install:
 	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-	for f in ${BIN_FILES}; do \
-		TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB_PYTHON_VER}`; \
-		TARGET_MAJOR=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB_PYTHON_MAJOR_VER}`; \
-		cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$TARGET_MAJOR; \
-		cd ${PREFIX}/bin && ${LN} -sf $$TARGET_MAJOR $$f; \
-	done
-.endif
-
-.for file in python python-config
-	cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/}
-.endfor
-
 .if !defined(NOPORTDATA)
 	@${MKDIR} ${DATADIR}
 	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index 02f00218823e..b23e7920146b 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -1,27 +1,11 @@
 libdata/pkgconfig/python-2.7.pc
-%%IF_DEFAULT%%bin/2to3
-%%IF_DEFAULT%%bin/2to3-%%PYMAJOR%%
 bin/2to3-%%PYVER%%
-%%IF_DEFAULT%%bin/idle
-%%IF_DEFAULT%%bin/idle%%PYMAJOR%%
 bin/idle%%PYVER%%
-%%IF_DEFAULT%%bin/pydoc
-%%IF_DEFAULT%%bin/pydoc%%PYMAJOR%%
 bin/pydoc%%PYVER%%
-%%IF_DEFAULT%%bin/python
-%%IF_DEFAULT%%bin/python%%PYMAJOR%%
 bin/python%%PYVER%%
-%%IF_DEFAULT%%bin/python-config
-%%IF_DEFAULT%%bin/python%%PYMAJOR%%-config
 bin/python%%PYVER%%-config
-%%IF_DEFAULT%%bin/python-shared
-%%IF_DEFAULT%%bin/python-shared%%PYMAJOR%%
 bin/python-shared%%PYVER%%
-%%IF_DEFAULT%%bin/python-shared-config
-%%IF_DEFAULT%%bin/python-shared%%PYMAJOR%%-config
 bin/python-shared%%PYVER%%-config
-%%IF_DEFAULT%%bin/smtpd.py
-%%IF_DEFAULT%%bin/smtpd%%PYMAJOR%%.py
 bin/smtpd%%PYVER%%.py
 %%PYTHON_INCLUDEDIR%%/Python-ast.h
 %%PYTHON_INCLUDEDIR%%/Python.h
diff --git a/lang/python3/Makefile b/lang/python3/Makefile
new file mode 100644
index 000000000000..3ac4fbebd9e7
--- /dev/null
+++ b/lang/python3/Makefile
@@ -0,0 +1,53 @@
+# $FreeBSD$
+
+PORTNAME=	python3
+PORTVERSION=	${PYTHON_MAJOR_VER}
+CATEGORIES=	lang python ipv6
+MASTER_SITES=
+DISTFILES=
+EXTRACT_ONLY=
+
+MAINTAINER=	python@FreeBSD.org
+COMMENT=	The "meta-port" for version 3 of the Python interpreter
+
+USE_PYTHON_RUN=	yes
+PYTHON_VERSION=	${PYTHON3_DEFAULT_VERSION}
+NO_BUILD=	yes
+
+PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER} \
+		bin/idle${PYTHON_MAJOR_VER} \
+		bin/pydoc${PYTHON_MAJOR_VER} \
+		bin/python${PYTHON_MAJOR_VER} \
+		bin/python${PYTHON_MAJOR_VER}-config \
+		bin/python-shared${PYTHON_MAJOR_VER} \
+		bin/python-shared${PYTHON_MAJOR_VER}-config
+
+.include <bsd.port.pre.mk>
+
+do-install:
+.for file in python python-shared
+	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_VER} ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
+.endfor
+	${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_VER} ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
+.for file in idle pydoc
+	${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
+.endfor
+	${LN} -sf ${PREFIX}/bin/python${PYTHON_VER}-config ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
+	${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_VER}-config ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config
+
+# Major upgrade support
+PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade
+
+.if defined(USE_PORTMASTER)
+PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
+.endif
+
+.if defined(WITH_PKGNG)
+PKG_LIST=	${PKG_BIN} query -a '%n-%v'
+PKG_LIST_FILES=	${PKG_INFO} -l
+.else
+PKG_LIST=	${PKG_INFO} -Ea
+PKG_LIST_FILES=	${PKG_INFO} -L
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/lang/python3/pkg-descr b/lang/python3/pkg-descr
new file mode 100644
index 000000000000..f595c479c814
--- /dev/null
+++ b/lang/python3/pkg-descr
@@ -0,0 +1,4 @@
+Python is an interpreted object-oriented programming language, and is
+often compared to Tcl, Perl or Scheme.
+
+WWW: http://www.python.org/
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 4495d95dc5c5..c6f47e13aaca 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	python31
 PORTVERSION=	3.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -67,19 +67,6 @@ CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-MLINKS=		${PYTHON_VERSION}.1 python.1
-PLIST_SUB+=	IF_DEFAULT=""
-.else
-PLIST_SUB+=	IF_DEFAULT="@comment "
-.endif
-
-.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
-PLIST_SUB+=	IF_DEFAULT_MAJOR=""
-.else
-PLIST_SUB+=	IF_DEFAULT_MAJOR="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 CONFIGURE_ARGS+=	--with-threads
@@ -222,19 +209,6 @@ post-install:
 	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-	for f in ${BIN_FILES}; do \
-		TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
-		cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$f; \
-	done
-.endif
-
-.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
-.for file in python python-config
-	cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/}
-.endfor
-.endif
-
 .if !defined(NOPORTDATA)
 	@${MKDIR} ${DATADIR}
 	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index f64379eb1ee0..dc929e8f878c 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -1,18 +1,9 @@
-%%IF_DEFAULT%%bin/2to3
 bin/2to3-%%PYVER%%
-%%IF_DEFAULT%%bin/idle3
 bin/idle3-%%PYVER%%
-%%IF_DEFAULT%%bin/pydoc3
 bin/pydoc3-%%PYVER%%
-%%IF_DEFAULT%%bin/python
-%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%
 bin/python%%PYVER%%
-%%IF_DEFAULT%%bin/python-config
-%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%-config
 bin/python%%PYVER%%-config
-%%IF_DEFAULT%%bin/python-shared
 bin/python-shared%%PYVER%%
-%%IF_DEFAULT%%bin/python-shared-config
 bin/python-shared%%PYVER%%-config
 lib/lib%%PYTHON_VERSION%%.a
 lib/lib%%PYTHON_VERSION%%.so
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index cf5c5563e53b..8f25c1f9af31 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	python32
 PORTVERSION=	3.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -65,19 +65,6 @@ CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-MLINKS=		${PYTHON_VERSION}.1 python.1
-PLIST_SUB+=	IF_DEFAULT=""
-.else
-PLIST_SUB+=	IF_DEFAULT="@comment "
-.endif
-
-.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
-PLIST_SUB+=	IF_DEFAULT_MAJOR=""
-.else
-PLIST_SUB+=	IF_DEFAULT_MAJOR="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 CONFIGURE_ARGS+=	--with-threads
@@ -212,19 +199,6 @@ post-install:
 	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-	for f in ${BIN_FILES}; do \
-		TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
-		cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$f; \
-	done
-.endif
-
-.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
-.for file in python python-config
-	cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/}
-.endfor
-.endif
-
 .if !defined(NOPORTDATA)
 	@${MKDIR} ${DATADIR}
 	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 36777cbb5b05..626efe8efc22 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -1,18 +1,9 @@
-%%IF_DEFAULT%%bin/2to3
 bin/2to3-%%PYVER%%
-%%IF_DEFAULT%%bin/idle3
 bin/idle3-%%PYVER%%
-%%IF_DEFAULT%%bin/pydoc3
 bin/pydoc3-%%PYVER%%
-%%IF_DEFAULT%%bin/python
-%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%
 bin/python%%PYVER%%
-%%IF_DEFAULT%%bin/python-config
-%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%-config
 bin/python%%PYVER%%-config
-%%IF_DEFAULT%%bin/python-shared
 bin/python-shared%%PYVER%%
-%%IF_DEFAULT%%bin/python-shared-config
 bin/python-shared%%PYVER%%-config
 bin/python%%PYVER%%%%PYABIVER%%
 bin/python%%PYVER%%%%PYABIVER%%-config
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 630e93e77b95..d8d7269a00d3 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	python33
 PORTVERSION=	3.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -66,19 +66,6 @@ CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-MLINKS=		${PYTHON_VERSION}.1 python.1
-PLIST_SUB+=	IF_DEFAULT=""
-.else
-PLIST_SUB+=	IF_DEFAULT="@comment "
-.endif
-
-.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
-PLIST_SUB+=	IF_DEFAULT_MAJOR=""
-.else
-PLIST_SUB+=	IF_DEFAULT_MAJOR="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 CONFIGURE_ARGS+=	--with-threads
@@ -208,19 +195,6 @@ post-install:
 	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
 
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
-	for f in ${BIN_FILES}; do \
-		TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \
-		cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$f; \
-	done
-.endif
-
-.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION}
-.for file in python python-config
-	cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/}
-.endfor
-.endif
-
 .if !defined(NOPORTDATA)
 	@${MKDIR} ${DATADIR}
 	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
diff --git a/lang/python33/pkg-plist b/lang/python33/pkg-plist
index 240b24851fb2..0f0726b92ce3 100644
--- a/lang/python33/pkg-plist
+++ b/lang/python33/pkg-plist
@@ -1,18 +1,9 @@
-%%IF_DEFAULT%%bin/2to3
 bin/2to3-%%PYVER%%
-%%IF_DEFAULT%%bin/idle3
 bin/idle3-%%PYVER%%
-%%IF_DEFAULT%%bin/pydoc3
 bin/pydoc3-%%PYVER%%
-%%IF_DEFAULT%%bin/python
-%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%
 bin/python%%PYVER%%
-%%IF_DEFAULT%%bin/python-config
-%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%-config
 bin/python%%PYVER%%-config
-%%IF_DEFAULT%%bin/python-shared
 bin/python-shared%%PYVER%%
-%%IF_DEFAULT%%bin/python-shared-config
 bin/python-shared%%PYVER%%-config
 bin/python%%PYVER%%%%PYABIVER%%
 bin/python%%PYVER%%%%PYABIVER%%-config