diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile
index 421d4694e8a4..c73de40c0aef 100644
--- a/devel/qt5-qmake/Makefile
+++ b/devel/qt5-qmake/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	qmake
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt Makefile generator
 
 USES=		compiler:c++11-lib gmake pkgconfig \
 		python:build qmake:no_env qt-dist:5,base shebangfix
 SHEBANG_FILES=	util/harfbuzz/update-harfbuzz \
 		util/unicode/x11/makeencodings \
 		src/3rdparty/freetype/src/tools/afblue.pl \
 		mkspecs/features/data/mac/objc_namespace.sh \
 		mkspecs/features/uikit/devices.py \
 		mkspecs/features/uikit/device_destinations.sh
 
 REINPLACE_ARGS=	-i ""
 HAS_CONFIGURE=	yes
 # Disable everything to install minimal qconfig.pri.
 CONFIGURE_ARGS=	-no-accessibility -no-openssl -no-gui -no-cups \
 		-no-iconv -no-icu -no-dbus -no-xcb -no-opengl \
 		-no-glib -no-fontconfig \
 		-no-gtk \
 		-no-evdev -no-xkbcommon \
 		-no-freetype -no-gif -no-harfbuzz -no-libjpeg \
 		-no-libpng -no-widgets
 QMAKESPEC=	freebsd-${QMAKE_COMPILER}
 INSTALL_TARGET=	sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
 
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 
 QT_BINARIES=	yes
 
 post-patch:
 # Clean up files created by patching
 	@${RM} ${WRKSRC}/mkspecs/*/*.orig
 
 post-build:
 # Complete configure stage to generate *.pri files.
 	cd ${WRKSRC} && \
 		${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" BUILD_QMAKE=1 \
 		${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
 post-install:
 	${RLN} ${STAGEDIR}${QT_BINDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-qt5
 .include <bsd.port.mk>
diff --git a/devel/qt5-qmake/files/patch-config.tests_arch_arch.pro b/devel/qt5-qmake/files/patch-config.tests_arch_arch.pro
new file mode 100644
index 000000000000..051a52f38555
--- /dev/null
+++ b/devel/qt5-qmake/files/patch-config.tests_arch_arch.pro
@@ -0,0 +1,6 @@
+--- config.tests/arch/arch.pro.orig	2021-05-26 21:40:42 UTC
++++ config.tests/arch/arch.pro
+@@ -1,2 +1,3 @@
+ SOURCES = arch.cpp
++QMAKE_CXXFLAGS += $$(CXXFLAGS)
+ include(write_info.pri)
diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile
index 073c11b7d136..cbcda61880d6 100644
--- a/graphics/qt5-3d/Makefile
+++ b/graphics/qt5-3d/Makefile
@@ -1,17 +1,23 @@
 PORTNAME=	3d
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt3D module
 
 LIB_DEPENDS=	libassimp.so:multimedia/assimp
 
 USES=		compiler:c++11-lang pkgconfig qmake:norecursive qt-dist:5,3d
 USE_QT=		concurrent core declarative gui network buildtools_build
 
+OPTIONS_DEFINE_amd64=	AVX
+OPTIONS_DEFINE_i386=	AVX
+
+AVX_DESC=		Build for Intel CPUs with AVX* support (Haswell+)
+AVX_EXTRA_PATCHES=	${FILESDIR}/extrapatch-src_core_configure.json
+
 QT_BINARIES=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/qt5-3d/files/patch-src_core_configure.json b/graphics/qt5-3d/files/extrapatch-src_core_configure.json
similarity index 100%
rename from graphics/qt5-3d/files/patch-src_core_configure.json
rename to graphics/qt5-3d/files/extrapatch-src_core_configure.json