diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index 2ccabff14619..30a7cd696e76 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -1,24 +1,22 @@
 PORTNAME=	wheel
 PORTVERSION=	0.45.1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Built-package format for Python
 WWW=		https://github.com/pypa/wheel
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.8:devel/py-flit-core@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	allflavors autoplist concurrent pep517
 
 # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268500
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 NO_ARCH=	yes
 
-CONFLICTS_INSTALL=	py*-wheel044
-
 .include <bsd.port.mk>
diff --git a/devel/py-wheel044/Makefile b/devel/py-wheel044/Makefile
index 870d4b327e74..91f2a06f8b82 100644
--- a/devel/py-wheel044/Makefile
+++ b/devel/py-wheel044/Makefile
@@ -1,28 +1,39 @@
 PORTNAME=	wheel
 PORTVERSION=	0.44.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	044
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Built-package format for Python
 WWW=		https://github.com/pypa/wheel
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.8:devel/py-flit-core@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	allflavors autoplist concurrent pep517
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}wheel
 PORTSCOUT=	ignore:1
 
 # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268500
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 NO_ARCH=	yes
 
-CONFLICTS_INSTALL=	py*-wheel
+post-install:
+# move everything under setuptools vendor directory
+	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/setuptools/_vendor
+	@${MV} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.dist-info \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g} \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/setuptools/_vendor
+	@${REINPLACE_CMD} -e 's|${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME:C|[-_]+|_|g}|${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/setuptools/_vendor/${PORTNAME:C|[-_]+|_|g}|g' \
+		-e 's|bin/|@comment bin/|' \
+		${_PYTHONPKGLIST}
+# add .pth so setuptools build knows we exist
+	@${ECHO_CMD} setuptools/_vendor > ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}${PKGNAMESUFFIX}.pth
+	@${ECHO_CMD} ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}${PKGNAMESUFFIX}.pth >> ${_PYTHONPKGLIST}
 
 .include <bsd.port.mk>