diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 4deeda4c926a..ed7f7b3a1821 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -1,71 +1,76 @@
 PORTNAME=	calligra
 DISTVERSION=	3.2.1
 PORTREVISION=	34
 CATEGORIES=	editors kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
 
+PATCH_SITES=	https://invent.kde.org/office/calligra/-/commit/
+# Poppler 22.03
+PATCHFILES=	236bacbe13739414e919de868283b0caf2df5d8a.diff:-p1 \
+		6b75bec784c9835c78993349845d8c2ef22ec3de.diff:-p1
+
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE office suite
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libKPropertyCore3.so:x11-toolkits/kproperty \
 		libKReport3.so:textproc/kreport \
 		libboost_thread.so:devel/boost-libs \
 		libetonyek-0.1.so:graphics/libetonyek01 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgsl.so:math/gsl \
 		liblcms2.so:graphics/lcms2 \
 		libKGantt.so:graphics/kdiagram \
 		libodfgen-0.1.so:textproc/libodfgen01 \
 		libpng.so:graphics/png \
 		libpoppler-qt5.so:graphics/poppler-qt5 \
 		libpoppler.so:graphics/poppler \
 		librevenge-0.0.so:textproc/librevenge \
 		libtiff.so:graphics/tiff \
 		libvisio-0.1.so:textproc/libvisio01 \
 		libwpd-0.10.so:textproc/libwpd010 \
 		libwpg-0.3.so:graphics/libwpg03 \
 		libwps-0.4.so:textproc/libwps
 
 BUILD_DEPENDS=	pstoedit:graphics/pstoedit
 RUN_DEPENDS=	pstoedit:graphics/pstoedit
 
 USES=		cmake cpe compiler:c++17-lang desktop-file-utils eigen:3 \
 		gettext iconv:translit jpeg kde:5 localbase:ldflags perl5 \
 		pkgconfig qca qt:5 shared-mime-info sqlite tar:xz xorg
 USE_KDE=	akonadicontacts activities archive auth bookmarks codecs completion \
 		config configwidgets contacts coreaddons crash dbusaddons doctools ecm \
 		emoticons guiaddons holidays i18n iconthemes init itemmodels itemviews \
 		jobwidgets js kcmutils kdelibs4support khtml kio \
 		kross notifications notifyconfig parts service solid sonnet \
 		texteditor textwidgets threadweaver unitconversion wallet \
 		widgetsaddons windowsystem xmlgui \
 		calendarcore okular
 USE_QT=		buildtools_build concurrent core dbus declarative gui network opengl \
 		phonon4 printsupport qmake_build \
 		script sql svg testlib webkit widgets x11extras xml
 USE_XORG=	ice sm x11 xext
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	OPENEXR
 OPTIONS_DEFAULT=	OPENEXR
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
 
 CMAKE_ARGS=	-DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \
 		-DPRODUCTSET:STRING="DESKTOP"
 
 # Requested by upstream, to not include unfinished modules
 CMAKE_ON=	RELEASE_BUILD
 # Performance increase according to README.PACKAGERS
 CMAKE_ARGS+=	-DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT"
 
 PLIST_SUB+=	SHLIB_VER=17.0.0
 
 .include <bsd.port.mk>
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index acc5d990cb30..0883047e77ae 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1589553313
+TIMESTAMP = 1650987962
 SHA256 (KDE/calligra/calligra-3.2.1.tar.xz) = b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147
 SIZE (KDE/calligra/calligra-3.2.1.tar.xz) = 55207684
+SHA256 (KDE/calligra/236bacbe13739414e919de868283b0caf2df5d8a.diff) = 9d872dc5e9f69fa1446a2f8ddcf30a34e943b150e89918e7383085aad2092b96
+SIZE (KDE/calligra/236bacbe13739414e919de868283b0caf2df5d8a.diff) = 2530
+SHA256 (KDE/calligra/6b75bec784c9835c78993349845d8c2ef22ec3de.diff) = 86766f19d6e42533533a971eeb80cc06aa27fff24ac6d652714b5c8b7a676c9c
+SIZE (KDE/calligra/6b75bec784c9835c78993349845d8c2ef22ec3de.diff) = 3091