diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile
index 8b3cc72d4569..f92baaf33d92 100644
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	fdm
-PORTVERSION=	2.1
+PORTVERSION=	2.2
 CATEGORIES=	mail
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Fetches and delivers mail
 WWW=		https://github.com/nicm/fdm
 
 LICENSE=	ISCL
 
 LIB_DEPENDS=	libtdb.so:databases/tdb
 
-USES=		autoreconf:build ssl
+USES=		autoreconf ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	nicm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
 
 PLIST_FILES=	bin/fdm man/man1/fdm.1.gz man/man5/fdm.conf.5.gz
 PORTDOCS=	CHANGES README MANUAL
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES PCRE
 OPTIONS_DEFAULT=PCRE
 
-PCRE_CFLAGS=	-DPCRE
-PCRE_LIBS=	-lpcre
-PCRE_LIB_DEPENDS=libpcre.so:devel/pcre
+PCRE_LIBS=	-lpcre2-8
+PCRE_LIB_DEPENDS=libpcre2-8.so:devel/pcre2
+PCRE_CONFIGURE_ENABLE=	pcre2
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/*.[15] ${WRKSRC}/MANUAL
-	@${ECHO_CMD} 'lex.c: parse.h' >> ${WRKSRC}/Makefile.am
+	${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/*.[15] ${WRKSRC}/MANUAL
+	${ECHO_CMD} 'lex.c: parse.h' >> ${WRKSRC}/Makefile.am
 
 pre-configure:
-	@cd ${WRKSRC} && sh autogen.sh
+	cd ${WRKSRC} && autoupdate
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} \
 		${STAGEDIR}${EXAMPLESDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/fdm/distinfo b/mail/fdm/distinfo
index 25493f241af1..287b535996e0 100644
--- a/mail/fdm/distinfo
+++ b/mail/fdm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655135652
-SHA256 (nicm-fdm-2.1_GH0.tar.gz) = 8da2fc2ea5fe31afd67b1a79bb9a1eee14a06879333ff9aaba294cea2be73f54
-SIZE (nicm-fdm-2.1_GH0.tar.gz) = 184711
+TIMESTAMP = 1673418876
+SHA256 (nicm-fdm-2.2_GH0.tar.gz) = 75d72794a0a7600c6c007b2f074f75f2852feb688325a7d24fb5dbab68e344ab
+SIZE (nicm-fdm-2.2_GH0.tar.gz) = 184913