diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index 2b2868fe31bc..37ca61ae5d41 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -1,7 +1,7 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
-DISTVERSION=	9.18.35
+DISTVERSION=	9.18.36
 PORTREVISION=	0
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo
index 7d7df381789e..a668a626a870 100644
--- a/dns/bind918/distinfo
+++ b/dns/bind918/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742397605
-SHA256 (bind-9.18.35.tar.xz) = 1bf332a8c056d92b87ffde518747f0b7ffd3e48be7ecaa43fa37fca131c52020
-SIZE (bind-9.18.35.tar.xz) = 5357312
+TIMESTAMP = 1744829385
+SHA256 (bind-9.18.36.tar.xz) = cd9a667bd33637dd9af331e4a203837cb3d53de5747eb2973c816dfaa68708f1
+SIZE (bind-9.18.36.tar.xz) = 5357976
diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl
index 05a3e750e06b..48b3f75c10f9 100644
--- a/dns/bind918/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind918/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2025-02-11 17:35:08 UTC
+--- bin/named/config.c.orig	2025-04-09 14:37:24 UTC
 +++ bin/named/config.c
 @@ -186,6 +186,7 @@ options {\n\
  	notify-source *;\n\
@@ -10,7 +10,7 @@ Add the override-cache-ttl feature.
  	parental-source *;\n\
  	parental-source-v6 *;\n\
  	provide-ixfr true;\n\
---- bin/named/server.c.orig	2025-02-11 17:35:08 UTC
+--- bin/named/server.c.orig	2025-04-09 14:37:24 UTC
 +++ bin/named/server.c
 @@ -4755,6 +4755,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
@@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
  	result = named_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asduration(obj);
---- doc/arm/reference.rst.orig	2025-02-11 17:35:08 UTC
+--- doc/arm/reference.rst.orig	2025-04-09 14:37:24 UTC
 +++ doc/arm/reference.rst
 @@ -4388,6 +4388,10 @@ Tuning
     cannot exceed 7 days and is silently truncated to 7 days if set to a
@@ -37,7 +37,7 @@ Add the override-cache-ttl feature.
  .. namedconf:statement:: max-cache-ttl
     :tags: server
     :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers.
---- lib/dns/include/dns/view.h.orig	2025-02-11 17:35:08 UTC
+--- lib/dns/include/dns/view.h.orig	2025-04-09 14:37:24 UTC
 +++ lib/dns/include/dns/view.h
 @@ -157,6 +157,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -47,9 +47,9 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2025-02-11 17:35:08 UTC
+--- lib/dns/resolver.c.orig	2025-04-09 14:37:24 UTC
 +++ lib/dns/resolver.c
-@@ -6454,6 +6454,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6425,6 +6425,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
  
  		/*
@@ -62,7 +62,7 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2025-02-11 17:35:08 UTC
+--- lib/isccfg/namedconf.c.orig	2025-04-09 14:37:25 UTC
 +++ lib/isccfg/namedconf.c
 @@ -2105,6 +2105,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist
index 241729210a33..28210402e054 100644
--- a/dns/bind918/pkg-plist
+++ b/dns/bind918/pkg-plist
@@ -240,19 +240,19 @@ include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
 lib/libbind9.so
-lib/libbind9-9.18.35.so
+lib/libbind9-9.18.36.so
 lib/libdns.so
-lib/libdns-9.18.35.so
+lib/libdns-9.18.36.so
 lib/libirs.so
-lib/libirs-9.18.35.so
+lib/libirs-9.18.36.so
 lib/libisc.so
-lib/libisc-9.18.35.so
+lib/libisc-9.18.36.so
 lib/libisccc.so
-lib/libisccc-9.18.35.so
+lib/libisccc-9.18.36.so
 lib/libisccfg.so
-lib/libisccfg-9.18.35.so
+lib/libisccfg-9.18.36.so
 lib/libns.so
-lib/libns-9.18.35.so
+lib/libns-9.18.36.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz
 @comment share/man/man1/dig.1.gz