diff --git a/lang/python-tools/Makefile b/lang/python-tools/Makefile
index cbfacf27d283..1b1444c5e197 100644
--- a/lang/python-tools/Makefile
+++ b/lang/python-tools/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	python-tools
 DISTVERSION=	${PYTHON_DISTVERSION}
 PORTREVISION=	1
 CATEGORIES=	lang python devel
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-${DISTVERSION}
+DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Supplementary tools for the Python language
 
 LICENSE=	PSFL
 
-PORTSCOUT=	ignore:1
-
 USES=		python shebangfix tar:xz
-USE_PYTHON=	flavors concurrent
-NO_BUILD=	yes
-NO_ARCH=	yes
+USE_PYTHON=	concurrent flavors
 
-DIST_SUBDIR=	python
 DISTINFO_FILE=	${.CURDIR}/../python${PYTHON_SUFFIX}/distinfo
-WRKSRC_SUBDIR=		Tools/scripts
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+PLIST_FILES=	${PYLIB_FILES:C|^|bin/|} ${SCRIPT_FILES:C|^|bin/|}
+
+SHEBANG_FILES=	${PYLIB_FILES:C|.*|Lib/&.py|} ${SCRIPT_FILES:C|.*|Tools/scripts/&.py|}
 
-SCRIPT_FILES=	byteyears copytime crlf dutree \
-		lfcr ptags untabify
 PYLIB_FILES=	tabnanny timeit
-PLIST_FILES=	${SCRIPT_FILES:C|^|bin/|} ${PYLIB_FILES:C|^|bin/|}
 
-SHEBANG_FILES=	${SCRIPT_FILES:C|$|.py|} \
-		${PYLIB_FILES:C|.*|../../Lib/&.py|}
+PORTSCOUT=	ignore:1
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 31200
+SCRIPT_FILES=	byteyears copytime crlf dutree lfcr ptags untabify
+.endif
 
 do-install:
-.for fname in ${SCRIPT_FILES}
-	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${fname}.py \
-		${STAGEDIR}${PREFIX}/bin/${fname}
-.endfor
 .for fname in ${PYLIB_FILES}
-	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/../../Lib/${fname}.py \
-		${STAGEDIR}${PREFIX}/bin/${fname}
+	${INSTALL_SCRIPT} ${WRKSRC}/Lib/${fname}.py ${STAGEDIR}${PREFIX}/bin/${fname}
+.endfor
+.for fname in ${SCRIPT_FILES}
+	${INSTALL_SCRIPT} ${WRKSRC}/Tools/scripts/${fname}.py ${STAGEDIR}${PREFIX}/bin/${fname}
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>