diff --git a/devel/pyside2-tools/Makefile b/devel/pyside2-tools/Makefile
index 91efc9a1ecbe..c67e47025397 100644
--- a/devel/pyside2-tools/Makefile
+++ b/devel/pyside2-tools/Makefile
@@ -1,41 +1,50 @@
 PORTNAME=	pyside2-tools
 DISTVERSION=	5.15.2
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyside-setup-opensource-src-${DISTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Pyside2 development tools
 
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		git>0:devel/git
 LIB_DEPENDS=	libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \
 		libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR}
 
 USES=		cmake gl python:3.5+ qt:5 shebangfix tar:xz xorg
 USE_GL=		gl
 USE_PYTHON=	flavors
 USE_QT=		3d buildtools charts core datavis3d declarative \
 		designer gui help location multimedia network opengl \
 		printsupport qmake_build script scripttools scxml sensors \
 		speech sql svg testlib uitools webchannel \
 		websockets widgets x11extras xml xmlpatterns
 
 SHEBANG_FILES=	pyside_tool.py
 
 CMAKE_ARGS+=	"-DUSE_PYTHON_VERSION=${PYTHON_VER}"
 
-.include <bsd.port.pre.mk>
-
 WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/pyside2-tools
 
-.if ${ARCH} == amd64 || ${ARCH} == i386
+OPTIONS_DEFINE_i386=	WEBENGINE
+OPTIONS_DEFINE_amd64=	WEBENGINE
+OPTIONS_DEFAULT_i386=	WEBENGINE
+OPTIONS_DEFAULT_amd64=	WEBENGINE
+
+WEBENGINE_DESC=	Enable QtWebEngine support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MWEBENGINE}
 USE_QT+=	webengine
+.else
+CMAKE_ARGS+=	-DDISABLE_QtWebEngine:BOOL=TRUE
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pyside2/Makefile b/devel/pyside2/Makefile
index e7211fb4fc05..e79b08c266ff 100644
--- a/devel/pyside2/Makefile
+++ b/devel/pyside2/Makefile
@@ -1,53 +1,61 @@
 PORTNAME=	pyside2
 DISTVERSION=	5.15.2
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyside-setup-opensource-src-${DISTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python Qt bindings for Qt 5.12+
 
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		git>0:devel/git
 LIB_DEPENDS=	libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR}
 
 USES=		cmake gl python:3.5+ qt:5 tar:xz
 USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
 USE_QT=		3d buildtools_build charts concurrent core datavis3d declarative \
 		designer gamepad gui help location multimedia network opengl \
 		printsupport qmake_build quickcontrols2 remoteobjects serialport \
 		script scripttools scxml sensors speech sql svg testlib uitools \
 		webchannel websockets widgets x11extras xml xmlpatterns
 
 CMAKE_ARGS+=	"-DUSE_PYTHON_VERSION=${PYTHON_VER}" \
 		"-DPYTHON_EXECUTABLE=${PYTHON_CMD}"
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE_i386=	WEBENGINE
+OPTIONS_DEFINE_amd64=	WEBENGINE
+OPTIONS_DEFAULT_i386=	WEBENGINE
+OPTIONS_DEFAULT_amd64=	WEBENGINE
+
+WEBENGINE_DESC=	Enable QtWebEngine support
 
 PLIST_SUB+=	PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 
 WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/pyside2
 
-.if ${ARCH} == amd64 || ${ARCH} == i386
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MWEBENGINE}
 PLIST_SUB+=	WEBENGINE=""
 USE_QT+=	webengine
 .else
 PLIST_SUB+=	WEBENGINE="@comment "
+CMAKE_ARGS+=	-DDISABLE_QtWebEngine:BOOL=TRUE
 .endif
 
 post-install:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>