diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index 194bb5cdb3cd..0eaa305e79b7 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -1,65 +1,62 @@
 PORTNAME=	pdf2djvu
-DISTVERSION=	0.9.17.1
-PORTREVISION=	17
+DISTVERSION=	0.9.18.2
+PORTREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/
 
-# Poppler 21.10 support
-PATCH_SITES=	https://github.com/jwilk/pdf2djvu/commit/
-PATCHFILES=	e528d3ab88c582e8481c9014982263d9c9e992fe.patch:-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++11-lang gettext-tools \
+USES=		autoreconf:build compiler:c++17-lang gettext-tools \
 		gmake iconv localbase pkgconfig tar:xz
-USE_CXXSTD=	c++11
+USE_CXXSTD=	c++17
 
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	COLOR_QUANTIZATION DOCS NLS MULTITHREADING XMP
-OPTIONS_DEFAULT=COLOR_QUANTIZATION          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 4d16a595e807..d4a6b4e18c85 100644
--- a/converters/pdf2djvu/distinfo
+++ b/converters/pdf2djvu/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1633515656
-SHA256 (pdf2djvu-0.9.17.1.tar.xz) = 5bbbb7bdc7858a1eeac6ff270e5a323390f2abb6bd3b0b2ae08c1965272226a3
-SIZE (pdf2djvu-0.9.17.1.tar.xz) = 295540
+TIMESTAMP = 1641936020
+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