diff --git a/graphics/qt6-svg/Makefile b/graphics/qt6-svg/Makefile
index 1b6c6acca233..7bbbcca0fb88 100644
--- a/graphics/qt6-svg/Makefile
+++ b/graphics/qt6-svg/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	svg
 DISTVERSION=	${QT6_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt6-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt6 classes for displaying the contents of SVG files
 WWW=		https://qt-project.org
 
 BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 LIB_DEPENDS=	libdouble-conversion.so:devel/double-conversion \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2 \
 		libharfbuzz.so:print/harfbuzz \
 		libicudata.so:devel/icu \
 		libpcre.so:devel/pcre \
 		libpcre2-16.so:devel/pcre2 \
 		libpng16.so:graphics/png \
 		libxkbcommon.so:x11/libxkbcommon \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang gettext-runtime gl gnome xorg \
 		qt-dist:6
 USE_GL=		egl gl opengl
 USE_GNOME=	glib20
 USE_QT=		base
 USE_XORG=	x11 xau xcb xdmcp
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 .include <bsd.port.mk>
diff --git a/graphics/qt6-svg/files/patch-src_svg_qsvghandler.cpp b/graphics/qt6-svg/files/patch-src_svg_qsvghandler.cpp
new file mode 100644
index 000000000000..8eb861736a32
--- /dev/null
+++ b/graphics/qt6-svg/files/patch-src_svg_qsvghandler.cpp
@@ -0,0 +1,11 @@
+--- src/svg/qsvghandler.cpp.orig	2023-10-02 03:05:52 UTC
++++ src/svg/qsvghandler.cpp
+@@ -3606,6 +3606,8 @@ static bool detectCycles(const QSvgNode *node, QList<c
+ 
+ static bool detectCycles(const QSvgNode *node, QList<const QSvgUse *> active = {})
+ {
++    if (Q_UNLIKELY(!node))
++        return false;
+     switch (node->type()) {
+     case QSvgNode::DOC:
+     case QSvgNode::G: