diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index 5b1c683fe8ae..646e48dd4a92 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -1,62 +1,67 @@
 PORTNAME=	pdf2djvu
 DISTVERSION=	0.9.18.2
 PORTREVISION=	2
 CATEGORIES=	converters
 MASTER_SITES=	https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/
 
+PATCH_SITES=	https://github.com/jwilk/pdf2djvu/commit/
+PATCHFILES=	e170ad557d5f13daeeac047dfaa79347bbe5062f.diff:-p1 \
+		956fedc7e0831126b9006efedad5519c14201c52.diff:-p1 \
+		dca43e8182174bc04e107eaefcafcfdfdf9bcd61.diff:-p1
+
 MAINTAINER=	samy.mahmoudi@gmail.com
 COMMENT=	Creates DjVu files from PDF files
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/pstreams/pstream.h:devel/pstreams
 LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre \
 		libpoppler.so:graphics/poppler
 
 USES=		autoreconf:build compiler:c++17-lang gettext-tools \
 		gmake iconv localbase pkgconfig tar:xz
 USE_CXXSTD=	c++17
 
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	COLOR_QUANTIZATION DOCS NLS MULTITHREADING XMP
 OPTIONS_DEFAULT=COLOR_QUANTIZATION          MULTITHREADING
 OPTIONS_SUB=	yes
 
 COLOR_QUANTIZATION_DESC=Color quantization via GraphicsMagick++
 DOCS_DESC=		Generate the man page
 NLS_DESC=		Native Language Support via gettext utilities
 MULTITHREADING_DESC=	Multithreading support via OpenMP
 XMP_DESC=		XMP metadata support via Exiv2
 
 COLOR_QUANTIZATION_CONFIGURE_WITH=graphicsmagick
 COLOR_QUANTIZATION_LIB_DEPENDS=	\
 		libGraphicsMagick++.so:graphics/GraphicsMagick \
 		libGraphicsMagick.so:graphics/GraphicsMagick
 
 DOCS_BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
 MULTITHREADING_CONFIGURE_ENABLE=openmp
 
 XMP_CONFIGURE_ENABLE=	xmp
 XMP_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 XMP_BROKEN=		graphics/exiv2 and graphics/poppler disagree about usable C++ standard
 
 pre-configure:
 	@cd ${WRKSRC} && ${SH} ${FILESDIR}/bootstrap
 	# Poppler 20.12 no longer installs the pc file for this private backend.
 	# https://github.com/jwilk/pdf2djvu/issues/144
 	${REINPLACE_CMD} -e 's|poppler-splash|poppler|g' ${WRKSRC}/configure
 
 post-build-DOCS-on:
 	@cd ${WRKSRC}/doc && ${GMAKE}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/converters/pdf2djvu/distinfo b/converters/pdf2djvu/distinfo
index d4a6b4e18c85..105a016d3457 100644
--- a/converters/pdf2djvu/distinfo
+++ b/converters/pdf2djvu/distinfo
@@ -1,5 +1,9 @@
-TIMESTAMP = 1641936020
+TIMESTAMP = 1649347393
 SHA256 (pdf2djvu-0.9.18.2.tar.xz) = 9ea03f21d841a336808d89d65015713c0785e7295a6559d77771dc795333a9fa
 SIZE (pdf2djvu-0.9.18.2.tar.xz) = 305912
-SHA256 (e528d3ab88c582e8481c9014982263d9c9e992fe.patch) = 39cd67224052205bcf65eddf30e71953b329e2775e917ebe0993bee4696590bb
-SIZE (e528d3ab88c582e8481c9014982263d9c9e992fe.patch) = 1149
+SHA256 (e170ad557d5f13daeeac047dfaa79347bbe5062f.diff) = 55518c001772b1956d5c833a0f206fc31b83bc7d25a8b51c5aa51aea56c87fcd
+SIZE (e170ad557d5f13daeeac047dfaa79347bbe5062f.diff) = 787
+SHA256 (956fedc7e0831126b9006efedad5519c14201c52.diff) = 82c675db1326ec85633376b47ecb6122d0e171dd183b0b8e6f0d6bba74442c4f
+SIZE (956fedc7e0831126b9006efedad5519c14201c52.diff) = 452
+SHA256 (dca43e8182174bc04e107eaefcafcfdfdf9bcd61.diff) = cf504eb1ec5a7159d965614fa62d90bccf03e0e29685881d1c3056c23a01b749
+SIZE (dca43e8182174bc04e107eaefcafcfdfdf9bcd61.diff) = 860
diff --git a/converters/pdf2djvu/files/patch-pdf2djvu.cc b/converters/pdf2djvu/files/patch-pdf2djvu.cc
new file mode 100644
index 000000000000..a75768b3c945
--- /dev/null
+++ b/converters/pdf2djvu/files/patch-pdf2djvu.cc
@@ -0,0 +1,12 @@
+--- pdf2djvu.cc.orig	2022-04-07 16:02:35 UTC
++++ pdf2djvu.cc
+@@ -89,7 +89,8 @@ static int get_page_for_goto_link(pdf::link::GoTo *got
+ #endif
+   }
+   else
+-    dest.reset(orig_dest->copy());
++    // https://github.com/jwilk/pdf2djvu/commit/81b635e014ebd0240a8719cc39b6a1b759cc6a98
++    dest.reset(new pdf::link::Destination(*orig_dest));
+   if (dest.get() != nullptr)
+   {
+     int page;