diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile
index f61592686a2e..f30f2284b5ea 100644
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -1,8 +1,9 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 
 PORTNAME=	fdm
-PORTVERSION=	2.1
+DISTVERSION=	2.1
 CATEGORIES=	mail
+MASTER_SITES=	https://github.com/nicm/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Fetches and delivers mail
@@ -11,9 +12,7 @@ LICENSE=	ISCL
 
 LIB_DEPENDS=	libtdb.so:databases/tdb
 
-USES=		autoreconf:build ssl
-USE_GITHUB=	yes
-GH_ACCOUNT=	nicm
+USES=		autoreconf ssl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
@@ -25,17 +24,13 @@ PORTEXAMPLES=	*
 OPTIONS_DEFINE=	DOCS EXAMPLES PCRE
 OPTIONS_DEFAULT=PCRE
 
-PCRE_CFLAGS=	-DPCRE
-PCRE_LIBS=	-lpcre
 PCRE_LIB_DEPENDS=libpcre.so:devel/pcre
+PCRE_CONFIGURE_ENABLE=	pcre
 
 post-patch:
 	@${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
-
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} \
diff --git a/mail/fdm/distinfo b/mail/fdm/distinfo
index 25493f241af1..8b1ebb86b7e3 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 = 1655234564
+SHA256 (fdm-2.1.tar.gz) = 858df2e6ef0836d940e8b8cc4fec333770fa9c97ba0f2485a9e63ed18b2cadff
+SIZE (fdm-2.1.tar.gz) = 318803