diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 7122e129c78a..7460cba4b29b 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -1,57 +1,57 @@
 # Created by: Piotr Kubaj <pkubaj@anongoth.pl>
 
 PORTNAME=	scribus
 PORTVERSION=	1.5.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \
 		http://www.scribus.net/downloads/${PORTVERSION}/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Comprehensive desktop publishing program (development version)
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libboost_thread.so:devel/boost-libs \
 		libhunspell-1.7.so:textproc/hunspell \
 		libcairo.so:graphics/cairo \
 		librevenge-0.0.so:textproc/librevenge \
 		libcups.so:print/cups \
 		libwpg-0.3.so:graphics/libwpg03 \
 		libcdr-0.1.so:graphics/libcdr01 \
 		libfreehand-0.1.so:graphics/libfreehand \
 		libpagemaker-0.0.so:print/libpagemaker \
 		libmspub-0.1.so:print/libmspub01 \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libfreetype.so:print/freetype2 \
 		libtiff.so:graphics/tiff \
 		libpoppler.so:graphics/poppler \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libpodofo.so:graphics/podofo \
 		libharfbuzz.so:print/harfbuzz \
 		libpng.so:graphics/png \
 		libicuuc.so:devel/icu \
 		libqxp-0.0.so:textproc/libqxp \
 		libzmf-0.0.so:graphics/libzmf
 
 USES=		cmake compiler:gcc-c++11-lib desktop-file-utils dos2unix gnome \
 		jpeg pkgconfig python:3.6+ qt:5 shared-mime-info tar:xz
 USE_QT=		buildtools_build core declarative gui linguisttools_build \
 		network opengl printsupport qmake_build widgets xml
 DOS2UNIX_REGEX=	.*\.(cpp|h|txt)
 USE_GNOME=	libxml2
 INSTALLS_ICONS=	yes
 
 CMAKE_ARGS+=	-DWANT_HUNSPELL=YES -DCMAKE_COLOR_MAKEFILE:BOOL=ON
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 		${LN} -sf ../share/icons/1_5_1/scribus.png \
 			${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>
diff --git a/print/scribus-devel/files/patch-harfbuzz-3.0.0 b/print/scribus-devel/files/patch-harfbuzz-3.0.0
new file mode 100644
index 000000000000..7045102fa0fd
--- /dev/null
+++ b/print/scribus-devel/files/patch-harfbuzz-3.0.0
@@ -0,0 +1,30 @@
+https://github.com/scribusproject/scribus/commit/1b546978bc4e
+https://bugs.scribus.net/view.php?id=16635
+
+--- scribus/fonts/sfnt.cpp.orig	2021-04-25 20:24:48 UTC
++++ scribus/fonts/sfnt.cpp
+@@ -1256,14 +1256,22 @@ namespace sfnt {
+ 
+ 		for (int i = 0; i < cids.count(); ++i)
+ 			hb_set_add(glyphSet, cids.at(i));
+-	
++
++#if HB_VERSION_ATLEAST(2, 9, 0)
++		uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get());
++		subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS;
++		subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING;
++		subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY;
++		hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags);
++#else
+ 		hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);
+ 		hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);
+ #if HB_VERSION_ATLEAST(2, 6, 5)
+ 		hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);
+ #endif
++#endif
+ 
+-		QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
++		QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));
+ 		if (hbSubsetFace.isNull())
+ 			return QByteArray();
+