diff --git a/print/cups/Makefile b/print/cups/Makefile
index 8c81a816af22..69fb7f7582b6 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,117 +1,122 @@
 PORTNAME=	cups
 DISTVERSION=	2.4.15
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/OpenPrinting/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
+PATCH_SITES=	https://github.com/OpenPrinting/cups/commit/
+PATCHFILES=	93c39a4beae637bc1648409e23c03cb53b92a2b9.patch:-p1 \
+		6efa179b8446a7999b9149c5101fb11580ea8998.patch:-p1
+
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Common UNIX Printing System
 WWW=		https://github.com/OpenPrinting/cups
 
 LICENSE=		APACHE20 CUPS
 LICENSE_COMB=		multi
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE
 LICENSE_FILE_CUPS=	${WRKSRC}/NOTICE
 LICENSE_NAME_CUPS=	Apache License v2.0 with CUPS Exceptions
 LICENSE_PERMS_CUPS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cpe gmake iconv localbase pkgconfig
 CPE_VENDOR=	linuxfoundation
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	cupsd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-relro \
 		--with-cups-group=${GROUPS} \
 		--with-cups-user=${USERS} \
 		--with-dbusdir="${PREFIX}/etc/dbus-1" \
 		--with-icondir="${PREFIX}/share/icons" \
 		--with-menudir="${DESKTOPDIR}" \
 		--with-optim=" " \
 		--with-pam-module="unix" \
 		--with-printcap="${PREFIX}/etc/printcap" \
 		--with-rcdir=no \
 		--with-system-groups=wheel \
 		--without-ondemand
 
 CONFLICTS=	LPRng
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 USERS=		cups
 GROUPS=		cups
 
 OPTIONS_DEFINE=		AVAHI DBUS DOCS GNUTLS IPPTOOL LIBPAPER NLS X11
 OPTIONS_DEFAULT=	AVAHI DBUS GNUTLS LIBPAPER
 OPTIONS_SUB=		yes
 
 IPPTOOL_DESC=	Internet Printing Protocol testing tool
 X11_DESC=	Install desktop menu item
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_WITH=	dnssd=avahi
 AVAHI_SUB_LIST=		AVAHI_DAEMON=avahi_daemon
 AVAHI_SUB_LIST_OFF=	AVAHI_DAEMON=
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_ENABLE=	dbus
 DBUS_SUB_LIST=		DBUS_DAEMON=dbus
 DBUS_SUB_LIST_OFF=	DBUS_DAEMON=
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	tls=gnutls
 
 LIBPAPER_LIB_DEPENDS=		libpaper.so:print/libpaper
 LIBPAPER_CONFIGURE_ENABLE=	libpaper
 
 X11_BUILD_DEPENDS=	xdg-open:devel/xdg-utils
 X11_RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 .if defined(CUPS_OVERWRITE_BASE)
 PLIST_SUB+=	OVERWRITE=""
 .else
 PLIST_SUB+=	OVERWRITE="@comment "
 .endif
 
 .if exists(/usr/lib/libusb.so)
 PLIST_SUB+=	USB=""
 .else
 PLIST_SUB+=	USB="@comment "
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug --enable-debug-printfs
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if empty(ICONV_LIB)
 CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in
 	@${REINPLACE_CMD} 's/usblp/ulpt/g' ${WRKSRC}/backend/usb-libusb.c
 	@${REINPLACE_CMD} -e 's|/usr/local/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} 's|/etc/cups|${LOCALBASE}/etc/cups|g' \
 		${WRKSRC}/man/*.[1-9]
 	@${REINPLACE_CMD} -e 's|\.default|.sample|'\
 		${WRKSRC}/cgi-bin/admin.c\
 		${WRKSRC}/conf/Makefile
 
 post-patch-DOCS-off:
 # Link to online documentation.
 	@${FIND} ${WRKSRC}/doc ${WRKSRC}/templates -type f -exec ${SED} -i '' \
 		-e 's|[Hh][Rr][Ee][Ff]="/*help/{[^"]*"|href="https://openprinting.github.io/cups/#DOCUMENTATION|g' \
 		-e 's|[Hh][Rr][Ee][Ff]="/*help/"|href="https://openprinting.github.io/cups/#DOCUMENTATION|g' \
 		-e '/have_gssapi/s|[Hh][Rr][Ee][Ff]="/*help/|href="https\\://openprinting.github.io/cups/doc/|g' \
 		-e 's|[Hh][Rr][Ee][Ff]="/*help/|href="https://openprinting.github.io/cups/doc/|g' {} +
 
 post-install:
 	${LN} -sf lpr ${STAGEDIR}${PREFIX}/bin/lpr-cups
 	${INSTALL_DATA} ${FILESDIR}/cups.conf.sample \
 		${STAGEDIR}${PREFIX}/etc/devd
 	${INSTALL_DATA} ${FILESDIR}/cups ${STAGEDIR}${PREFIX}/etc/pam.d
 
 .include <bsd.port.post.mk>
diff --git a/print/cups/distinfo b/print/cups/distinfo
index c0227fd8028e..324a8eba46cc 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1764416209
+TIMESTAMP = 1764759903
 SHA256 (cups-2.4.15-source.tar.gz) = eff0bbd48ff1abcbb8e46e28e85aefaffa391a1d9c4d8dc92ab3822a13008d7f
 SIZE (cups-2.4.15-source.tar.gz) = 8158215
+SHA256 (93c39a4beae637bc1648409e23c03cb53b92a2b9.patch) = 9e5e5033105dd9f2b504fa9965f2eec084c38c10513f769d008e8f6b7c2fff40
+SIZE (93c39a4beae637bc1648409e23c03cb53b92a2b9.patch) = 1735
+SHA256 (6efa179b8446a7999b9149c5101fb11580ea8998.patch) = 9e68c747a42ff981e390726e486606e01a327f073578227158c7cf1cf3afe39d
+SIZE (6efa179b8446a7999b9149c5101fb11580ea8998.patch) = 1711
diff --git a/print/cups/files/patch-conf_cupsd.conf.in b/print/cups/files/patch-conf_cupsd.conf.in
deleted file mode 100644
index 3085809210f4..000000000000
--- a/print/cups/files/patch-conf_cupsd.conf.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- conf/cupsd.conf.in.orig	2025-11-27 15:21:54 UTC
-+++ conf/cupsd.conf.in
-@@ -28,9 +28,6 @@ WebInterface @CUPS_WEBIF@
- # Web interface setting...
- WebInterface @CUPS_WEBIF@
- 
--# Timeout after cupsd exits if idle (applied only if cupsd runs on-demand - with -l)
--IdleExitTimeout @EXIT_TIMEOUT@
--
- # Restrict access to the server...
- <Location />
-   Order allow,deny
diff --git a/print/cups/files/patch-conf_mime.convs.in b/print/cups/files/patch-conf_mime.convs.in
index b460d92b0424..735459f22de1 100644
--- a/print/cups/files/patch-conf_mime.convs.in
+++ b/print/cups/files/patch-conf_mime.convs.in
@@ -1,15 +1,15 @@
 Lower PostScript-to-PostScript cost such that PostScript files are sent to
 PostScript printers directly without intermediate conversion to PDF, see
-http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format
+https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format
 
 --- conf/mime.convs.in.orig	2013-06-07 01:00:33 UTC
 +++ conf/mime.convs.in
 @@ -38,7 +38,7 @@
  # PostScript filters
  #
  
 -application/postscript		application/vnd.cups-postscript	66	pstops
 +application/postscript		application/vnd.cups-postscript	65	pstops
  
  ########################################################################
  #
diff --git a/print/cups/files/patch-scheduler_conf.c b/print/cups/files/patch-scheduler_conf.c
new file mode 100644
index 000000000000..56f728b40a7c
--- /dev/null
+++ b/print/cups/files/patch-scheduler_conf.c
@@ -0,0 +1,22 @@
+--- scheduler/conf.c.orig	2025-11-27 15:21:54 UTC
++++ scheduler/conf.c
+@@ -91,9 +91,7 @@ static const cupsd_var_t	cupsd_vars[] =
+ #ifdef HAVE_GSSAPI
+   { "GSSServiceName",		&GSSServiceName,	CUPSD_VARTYPE_STRING },
+ #endif /* HAVE_GSSAPI */
+-#ifdef HAVE_ONDEMAND
+   { "IdleExitTimeout",		&IdleExitTimeout,	CUPSD_VARTYPE_TIME },
+-#endif /* HAVE_ONDEMAND */
+   { "JobKillDelay",		&JobKillDelay,		CUPSD_VARTYPE_TIME },
+   { "JobRetryLimit",		&JobRetryLimit,		CUPSD_VARTYPE_INTEGER },
+   { "JobRetryInterval",		&JobRetryInterval,	CUPSD_VARTYPE_TIME },
+@@ -788,9 +786,7 @@ cupsdReadConfiguration(void)
+   DefaultLeaseDuration       = 86400;
+   MaxLeaseDuration           = 0;
+ 
+-#ifdef HAVE_ONDEMAND
+   IdleExitTimeout = 60;
+-#endif /* HAVE_ONDEMAND */
+ 
+   if (!strcmp(CUPS_DEFAULT_PEER_CRED, "off"))
+     PeerCred = CUPSD_PEERCRED_OFF;
diff --git a/print/cups/files/patch-scheduler_conf.h b/print/cups/files/patch-scheduler_conf.h
new file mode 100644
index 000000000000..4e4311c2670e
--- /dev/null
+++ b/print/cups/files/patch-scheduler_conf.h
@@ -0,0 +1,13 @@
+--- scheduler/conf.h.orig	2025-11-27 15:21:54 UTC
++++ scheduler/conf.h
+@@ -244,10 +244,8 @@ VAR char		*ServerKeychain		VALUE(NULL);
+ 					/* Keychain holding cert + key */
+ #endif /* HAVE_TLS */
+ 
+-#ifdef HAVE_ONDEMAND
+ VAR int			IdleExitTimeout		VALUE(60);
+ 					/* Time after which an idle cupsd will exit */
+-#endif /* HAVE_ONDEMAND */
+ 
+ #ifdef HAVE_AUTHORIZATION_H
+ VAR char		*SystemGroupAuthKey	VALUE(NULL);