diff --git a/audio/asterisk-espeak/Makefile b/audio/asterisk-espeak/Makefile
index 882098252219..f1e1eaa70e2f 100644
--- a/audio/asterisk-espeak/Makefile
+++ b/audio/asterisk-espeak/Makefile
@@ -1,53 +1,44 @@
 PORTNAME=	espeak
 PORTVERSION=	4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Espeak dialplan application for Asterisk
 
 LICENSE=	GPLv2
 
-DEPRECATED=	Depends on deprecated audio/espeaak
-EXPIRATION_DATE=2022-06-30
-
-LIB_DEPENDS=	libespeak.so:audio/espeak \
+LIB_DEPENDS=	libespeak-ng.so:audio/espeak-ng \
 		libsamplerate.so:audio/libsamplerate
 
-FLAVORS=			asterisk18 asterisk16
-FLAVOR?=			${FLAVORS:[1]}
-
-asterisk16_PKGNAMEPREFIX=	asterisk16-
-asterisk16_CONFLICTS_INSTALL=	asterisk13-espeak asterisk18-espeak
-asterisk16_BUILD_DEPENDS=	asterisk:net/asterisk16
-asterisk16_RUN_DEPENDS=		asterisk:net/asterisk16
+FLAVORS=	asterisk18 asterisk16
+FLAVOR?=	${FLAVORS:[1]}
 
-asterisk18_PKGNAMEPREFIX=	asterisk18-
-asterisk18_CONFLICTS_INSTALL=	asterisk13-espeak asterisk16-espeak
-asterisk18_BUILD_DEPENDS=	asterisk:net/asterisk18
-asterisk18_RUN_DEPENDS=		asterisk:net/asterisk18
+PKGNAMEPREFIX=		${FLAVOR}-
+BUILD_DEPENDS=		asterisk:net/${FLAVOR}
+RUN_DEPENDS=		asterisk:net/${FLAVOR}
 
 USES=		compiler:c11 gmake localbase
 INSTALL_TARGET=	install samples
 
-CONFLICTS_INSTALL=	asterisk*-espeak # etc/asterisk/espeak.conf.sample
+CONFLICTS_INSTALL=	asterisk[0-9][0-9]-espeak # etc/asterisk/espeak.conf.sample
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zaf
 GH_PROJECT=	Asterisk-eSpeak
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CFLAGS+=	-fblocks
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/ASTERISK_REGISTER_FILE/d' \
 		${WRKSRC}/app_espeak.c
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/asterisk/modules/app_espeak.so
 
 .include <bsd.port.post.mk>