diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index c4cbdf3eddb4..a54b016d8e2d 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ircd-hybrid
-PORTVERSION=	8.2.35
+PORTVERSION=	8.2.36
 CATEGORIES=	irc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/irc/ircd-hybrid/distinfo b/irc/ircd-hybrid/distinfo
index f8a0d772ec99..2933130c8103 100644
--- a/irc/ircd-hybrid/distinfo
+++ b/irc/ircd-hybrid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605449570
-SHA256 (ircd-hybrid-8.2.35.tgz) = 8a5d2eb98c48d01a9cf2f9bd554aa3e0e44291547a2a47e2a13044a2f868bc10
-SIZE (ircd-hybrid-8.2.35.tgz) = 1053942
+TIMESTAMP = 1607437448
+SHA256 (ircd-hybrid-8.2.36.tgz) = 9b3de456609dc8909d5185243a8b094c4ff910fa26f94be7462c226a3f78e469
+SIZE (ircd-hybrid-8.2.36.tgz) = 1056283
diff --git a/irc/ircd-hybrid/pkg-plist b/irc/ircd-hybrid/pkg-plist
index 8a14d97b6134..bd9c4870faf8 100644
--- a/irc/ircd-hybrid/pkg-plist
+++ b/irc/ircd-hybrid/pkg-plist
@@ -1,6 +1,7 @@
 bin/ircd
 bin/ircd-hybrid-mkpasswd
 %%ETCDIR%%/reference.conf
+etc/rc.d/ircd-hybrid
 lib/ircd-hybrid/modules/autoload/m_accept.la
 lib/ircd-hybrid/modules/autoload/m_accept.so
 lib/ircd-hybrid/modules/autoload/m_admin.la
@@ -51,10 +52,12 @@ lib/ircd-hybrid/modules/autoload/m_lusers.la
 lib/ircd-hybrid/modules/autoload/m_lusers.so
 lib/ircd-hybrid/modules/autoload/m_map.la
 lib/ircd-hybrid/modules/autoload/m_map.so
-@comment lib/ircd-hybrid/modules/autoload/m_metadata.la
-@comment lib/ircd-hybrid/modules/autoload/m_metadata.so
+lib/ircd-hybrid/modules/autoload/m_metadata.la
+lib/ircd-hybrid/modules/autoload/m_metadata.so
 lib/ircd-hybrid/modules/autoload/m_module.la
 lib/ircd-hybrid/modules/autoload/m_module.so
+lib/ircd-hybrid/modules/autoload/m_monitor.la
+lib/ircd-hybrid/modules/autoload/m_monitor.so
 lib/ircd-hybrid/modules/autoload/m_motd.la
 lib/ircd-hybrid/modules/autoload/m_motd.so
 lib/ircd-hybrid/modules/autoload/m_names.la
@@ -81,6 +84,8 @@ lib/ircd-hybrid/modules/autoload/m_stats.la
 lib/ircd-hybrid/modules/autoload/m_stats.so
 lib/ircd-hybrid/modules/autoload/m_svinfo.la
 lib/ircd-hybrid/modules/autoload/m_svinfo.so
+lib/ircd-hybrid/modules/autoload/m_svsaccount.la
+lib/ircd-hybrid/modules/autoload/m_svsaccount.so
 lib/ircd-hybrid/modules/autoload/m_svshost.la
 lib/ircd-hybrid/modules/autoload/m_svshost.so
 lib/ircd-hybrid/modules/autoload/m_svsjoin.la
@@ -119,8 +124,6 @@ lib/ircd-hybrid/modules/autoload/m_version.la
 lib/ircd-hybrid/modules/autoload/m_version.so
 lib/ircd-hybrid/modules/autoload/m_wallops.la
 lib/ircd-hybrid/modules/autoload/m_wallops.so
-lib/ircd-hybrid/modules/autoload/m_watch.la
-lib/ircd-hybrid/modules/autoload/m_watch.so
 lib/ircd-hybrid/modules/autoload/m_webirc.la
 lib/ircd-hybrid/modules/autoload/m_webirc.so
 lib/ircd-hybrid/modules/autoload/m_who.la
@@ -225,7 +228,7 @@ man/man8/ircd.8.gz
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/whois
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/whowas
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/xline
-@dir(ircd,ircd) /var/ircd-hybrid/lib
-@dir(ircd,ircd) /var/ircd-hybrid/log
-@dir(ircd,ircd) /var/ircd-hybrid/run
-@dir(ircd,ircd) /var/ircd-hybrid
+@dir /var/ircd-hybrid/lib
+@dir /var/ircd-hybrid/log
+@dir /var/ircd-hybrid/run
+@dir /var/ircd-hybrid