diff --git a/print/cups/Makefile b/print/cups/Makefile
index a5fcefd347e8..1a9e6c0b95cf 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,121 +1,117 @@
 PORTNAME=	cups
-DISTVERSION=	2.4.16
+DISTVERSION=	2.4.18
 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=	f5813db4347630ecdbf3fe97dac28aaabf341eff.patch:-p1 \
-		398fc2cd3881d54ce3e6b5ca0bb1529bdf8d0b5d.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 '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 c456fc41e092..89f0f43f82ae 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1765738398
-SHA256 (cups-2.4.16-source.tar.gz) = 0339587204b4f9428dd0592eb301dec0bf9ea6ea8dce5d9690d56be585aba92d
-SIZE (cups-2.4.16-source.tar.gz) = 8159166
-SHA256 (f5813db4347630ecdbf3fe97dac28aaabf341eff.patch) = b822e734f2885a74570fb570112136ac980e51a63456d7757ef18c803cd79629
-SIZE (f5813db4347630ecdbf3fe97dac28aaabf341eff.patch) = 1831
-SHA256 (398fc2cd3881d54ce3e6b5ca0bb1529bdf8d0b5d.patch) = e5a16061c7510efe3c0ebfe20d0b8a47d63398f7626fdf1b067cba80137154c4
-SIZE (398fc2cd3881d54ce3e6b5ca0bb1529bdf8d0b5d.patch) = 1295
+TIMESTAMP = 1777218672
+SHA256 (cups-2.4.18-source.tar.gz) = 8fe23bf4905f8889f4bd5ebf375e81916e84754bfc59eccc88cfd7b1e97a741b
+SIZE (cups-2.4.18-source.tar.gz) = 8162114