diff --git a/irc/anope/Makefile b/irc/anope/Makefile
index 23e17bb08300..0e96f36eb73c 100644
--- a/irc/anope/Makefile
+++ b/irc/anope/Makefile
@@ -1,90 +1,92 @@
 PORTNAME=	anope
 DISTVERSION=	2.0.16
+PORTREVISION=	1
 CATEGORIES=	irc
 
 MAINTAINER=	devnull@apt322.org
 COMMENT=	Set of IRC services for IRC networks
 WWW=		https://www.anope.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 USES=		cmake localbase:ldflags shebangfix
 USE_GITHUB=	yes
 USE_RC_SUBR=	anope
 SHEBANG_FILES=	${WRKSRC}/src/tools/*.sh
 
 CMAKE_ARGS=	-DINSTDIR:STRING="${PREFIX}/anope"
 CFLAGS_amd64=	-fPIC
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		GNUTLS LDAP MYSQL NLS OPENSSL PCRE POSIX REDIS SASL \
 			SQLITE STATS TRE
 OPTIONS_DEFAULT=	MYSQL OPENSSL POSIX
 OPTIONS_SUB=		yes
 POSIX_DESC=		POSIX Regex Module
 STATS_DESC=		Channel Statistics Module
 TRE_DESC=		Tre Regex Module
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 LDAP_USES=	ldap
 
 MYSQL_USES=	mysql
+MYSQL_CMAKE_ON=	-DEXTRA_LIBS:STRING="${LOCALBASE}/lib/mysql/"
 
 NLS_USES=	gettext
 
 OPENSSL_USES=	ssl
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
 REDIS_RUN_DEPENDS=	redis>=0:databases/redis
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 SQLITE_USES=	sqlite
 
 TRE_LIB_DEPENDS=	libtre.so:textproc/libtre
 
 post-patch:
 # Avoid conflict with C++20 <version> by adding -bin suffix
 	@${REINPLACE_CMD} -i .c++20 's/version /version-bin /' \
 		${WRKSRC}/include/CMakeLists.txt
 
 post-patch-GNUTLS-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_ssl_gnutls.cpp ${WRKSRC}/modules/
 
 post-patch-LDAP-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_ldap.cpp ${WRKSRC}/modules/
 	${LN} -s ${WRKSRC}/modules/extra/m_ldap_authentication.cpp ${WRKSRC}/modules/
 	${LN} -s ${WRKSRC}/modules/extra/m_ldap_oper.cpp ${WRKSRC}/modules/
 
 post-patch-MYSQL-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_mysql.cpp ${WRKSRC}/modules/
 	${LN} -s ${WRKSRC}/modules/extra/m_sql_authentication.cpp ${WRKSRC}/modules/
 	${LN} -s ${WRKSRC}/modules/extra/m_sql_log.cpp ${WRKSRC}/modules/
 	${LN} -s ${WRKSRC}/modules/extra/m_sql_oper.cpp ${WRKSRC}/modules/
 
 post-patch-OPENSSL-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_ssl_openssl.cpp ${WRKSRC}/modules/
 
 post-patch-PCRE-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_regex_pcre.cpp ${WRKSRC}/modules/
 
 post-patch-POSIX-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_regex_posix.cpp ${WRKSRC}/modules/
 
 post-patch-SQLITE-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_sqlite.cpp ${WRKSRC}/modules/
 
 post-patch-STATS-on:
 	${LN} -s ${WRKSRC}/modules/extra/stats ${WRKSRC}/modules/
 
 post-patch-TRE-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_regex_tre.cpp ${WRKSRC}/modules/
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/anope/data/backups
 	@${MKDIR} ${STAGEDIR}${PREFIX}/anope/logs
 
 .include <bsd.port.mk>
diff --git a/irc/anope/files/patch-modules_extra_m__mysql.cpp b/irc/anope/files/patch-modules_extra_m__mysql.cpp
deleted file mode 100644
index 0b44204ae072..000000000000
--- a/irc/anope/files/patch-modules_extra_m__mysql.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-Detection of "libmysqlclient" library is broken, so remove this check
---- modules/extra/m_mysql.cpp.orig	2015-04-23 14:25:58 UTC
-+++ modules/extra/m_mysql.cpp
-@@ -1,6 +1,3 @@
--/* RequiredLibraries: mysqlclient */
--/* RequiredWindowsLibraries: libmysql */
--
- #include "module.h"
- #include "modules/sql.h"
- #define NO_CLIENT_LONG_LONG
diff --git a/irc/anope/pkg-descr b/irc/anope/pkg-descr
index 0d937e200782..4198327d4db1 100644
--- a/irc/anope/pkg-descr
+++ b/irc/anope/pkg-descr
@@ -1,22 +1,16 @@
 Anope is a set of Services for IRC networks that allows users to
 manage their nicks and channels in a secure and efficient way, and
 administrators to manage their network with powerful tools.
 
 Anope currently works with:
   - Bahamut 1.4.27 or later (including 1.8)
-  - Charybdis 1.0 or later
-  - DreamForge 4.6.7
-  - Hybrid 7 or later
-  - InspIRCd 1.0 or later (including 3.x)
-  - Plexus 2.0 or later (including 3.0)
-  - PTlink 6.15 or later
-  - RageIRCd 2.0 beta-6 or later
-  - Ratbox 2.0.6 or later
-  - ShadowIRCd 4.0 beta 7 or later
-  - Solid IRCd 3.4.6 or later
-  - UltimateIRCd 2.8.2 or later (including 3.0)
-  - UnrealIRCd 3.1.1 or later (including 6.x)
-  - ViagraIRCd 1.3 or later
+  - Charybdis 3.4 or later
+  - ircd-hybrid 8.2.23 or later
+  - InspIRCd 1.2 or later
+  - ngIRCd 19.2 or later
+  - Plexus 3 or later
+  - Ratbox 3 or later
+  - UnrealIRCd 3.2 or later
 
 Anope could also work with some of the daemons derived by the ones listed
 above, but there's no support for them if they work or don't work.